Capture mode: fullscreen capture consistency.

- Change the fullscreen string to be consistent in image capture and
video capture scenarios
- Click/Tap anywhere can start fullscreen capture

TODO:
- cursor change will be done in a following up cl.

Bug: 1142937
Change-Id: Ife37530245cbc48f8c75be0756d4d45157aac874
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536081Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Commit-Queue: Xiaoqian Dai <xdai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827181}

ash/ash_strings.grd

@@ -3115,6 +3115,12 @@ Here are some things you can try to get started.
       <message name="IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_IMAGE_CAPTURE_TABLET" desc="The capture label message which shows in the middle of the screen when in fullscreen image capture mode in tablet mode.">
         Tap anywhere to capture full screen
       </message>
+      <message name="IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_VIDEO_RECORD_CLAMSHELL" desc="The capture label message which shows in the middle of the screen when in fullscreen image capture mode in clamshell mode.">
+        Click anywhere to record full screen
+      </message>
+      <message name="IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_VIDEO_RECORD_TABLET" desc="The capture label message which shows in the middle of the screen when in fullscreen image capture mode in tablet mode.">
+        Tap anywhere to record full screen
+      </message>
       <message name="IDS_ASH_SCREEN_CAPTURE_LABEL_REGION_IMAGE_CAPTURE" desc="The caputre label message which shows in the middle of the screen when in region image capture mode.">
         Drag to select an area to capture
       </message>

ash/ash_strings_grd/IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_VIDEO_RECORD_CLAMSHELL.png.sha1

+bed4b23cb2a59383349576dcc4fecf61675dcaf2
\ No newline at end of file

ash/ash_strings_grd/IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_VIDEO_RECORD_TABLET.png.sha1

+ad97137204ac48e4c52fde2278eec258be20c9f3
\ No newline at end of file

ash/capture_mode/capture_label_view.cc

@@ -187,15 +187,14 @@ void CaptureLabelView::UpdateIconAndText() {
   base::string16 text;
   switch (source) {
     case CaptureModeSource::kFullscreen:
-      icon = is_capturing_image
-                 ? gfx::ImageSkia()
-                 : gfx::CreateVectorIcon(kCaptureModeVideoIcon, icon_color);
       text = l10n_util::GetStringUTF16(
           is_capturing_image
               ? (in_tablet_mode
                      ? IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_IMAGE_CAPTURE_TABLET
                      : IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_IMAGE_CAPTURE_CLAMSHELL)
-              : IDS_ASH_SCREEN_CAPTURE_LABEL_VIDEO_RECORD);
+              : (in_tablet_mode
+                     ? IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_VIDEO_RECORD_TABLET
+                     : IDS_ASH_SCREEN_CAPTURE_LABEL_FULLSCREEN_VIDEO_RECORD_CLAMSHELL));
       break;
     case CaptureModeSource::kWindow: {
       if (in_tablet_mode) {

ash/capture_mode/capture_mode_session.cc

@@ -553,11 +553,6 @@ void CaptureModeSession::OnLocatedEvent(ui::LocatedEvent* event,
     return;
   }
 
-  // No need to handle events if the current source is kFullscreen.
-  const CaptureModeSource capture_source = controller_->source();
-  if (capture_source == CaptureModeSource::kFullscreen)
-    return;
-
   gfx::Point location = event->location();
   gfx::Point screen_location = event->location();
   aura::Window* event_target = static_cast<aura::Window*>(event->target());
@@ -568,7 +563,11 @@ void CaptureModeSession::OnLocatedEvent(ui::LocatedEvent* event,
       capture_mode_bar_widget_->GetWindowBoundsInScreen().Contains(
           screen_location);
 
-  if (capture_source == CaptureModeSource::kWindow) {
+  const CaptureModeSource capture_source = controller_->source();
+  const bool is_capture_fullscreen =
+      capture_source == CaptureModeSource::kFullscreen;
+  const bool is_capture_window = capture_source == CaptureModeSource::kWindow;
+  if (is_capture_fullscreen || is_capture_window) {
     // Do not handle any event located on the capture mode bar.
     if (is_event_on_capture_bar)
       return;
@@ -580,13 +579,15 @@ void CaptureModeSession::OnLocatedEvent(ui::LocatedEvent* event,
       case ui::ET_MOUSE_MOVED:
       case ui::ET_TOUCH_PRESSED:
       case ui::ET_TOUCH_MOVED: {
-        capture_window_observer_->UpdateSelectedWindowAtPosition(
-            screen_location);
+        if (is_capture_window) {
+          capture_window_observer_->UpdateSelectedWindowAtPosition(
+              screen_location);
+        }
         break;
       }
       case ui::ET_MOUSE_RELEASED:
       case ui::ET_TOUCH_RELEASED:
-        if (GetSelectedWindow())
+        if (is_capture_fullscreen || (is_capture_window && GetSelectedWindow()))
           controller_->PerformCapture();
         break;
       default:

ash/capture_mode/capture_mode_unittests.cc

@@ -1460,4 +1460,24 @@ TEST_F(CaptureModeTest, NumberOfCaptureRegionAdjustmentsHistogram) {
   histogram_tester.ExpectBucketCount(kTabletHistogram, 0, 1);
 }
 
+TEST_F(CaptureModeTest, FullscreenCapture) {
+  ui::ScopedAnimationDurationScaleMode animatin_scale(
+      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
+  CaptureModeController* controller = StartCaptureSession(
+      CaptureModeSource::kFullscreen, CaptureModeType::kImage);
+  EXPECT_TRUE(controller->IsActive());
+  // Press anywhere to capture image.
+  auto* event_generator = GetEventGenerator();
+  event_generator->ClickLeftButton();
+  EXPECT_FALSE(controller->IsActive());
+
+  controller = StartCaptureSession(CaptureModeSource::kFullscreen,
+                                   CaptureModeType::kVideo);
+  EXPECT_TRUE(controller->IsActive());
+  // Press anywhere to capture video.
+  event_generator->ClickLeftButton();
+  WaitForCountDownToFinish();
+  EXPECT_FALSE(controller->IsActive());
+}
+
 }  // namespace ash