capture_mode: Capture bar does not intersect autoclick.

Adds capture mode on the collision course for bubbles like PIP and autoclick, and triggers repositioning of the autoclick on enter or exit capture mode. Fixed: 1149758 Test: manual Change-Id: I800b2b265374627718cd944d39d76dc4e94be7fb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2597219 Reviewed-by: Ahmed Fakhry <[email protected]> Commit-Queue: Sammie Quon <[email protected]> Cr-Commit-Position: refs/heads/master@{#859045}
blueboxd · Mar 2, 2021 · 8cd3185 · 8cd3185
1 parent 12c35aa
commit 8cd3185
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 17 deletions.
diff --git a/ash/capture_mode/capture_mode_controller.cc b/ash/capture_mode/capture_mode_controller.cc
@@ -330,6 +330,10 @@ CaptureModeController* CaptureModeController::Get() {
   return g_instance;
 }
 
+bool CaptureModeController::IsActive() const {
+  return capture_mode_session_ && !capture_mode_session_->is_shutting_down();
+}
+
 void CaptureModeController::SetSource(CaptureModeSource source) {
   if (source == source_)
     return;
@@ -395,11 +399,13 @@ void CaptureModeController::Start(CaptureModeEntryType entry_type) {
   delegate_->OnSessionStateChanged(/*started=*/true);
 
   capture_mode_session_ = std::make_unique<CaptureModeSession>(this);
+  capture_mode_session_->Initialize();
 }
 
 void CaptureModeController::Stop() {
   DCHECK(IsActive());
   capture_mode_session_->ReportSessionHistograms();
+  capture_mode_session_->Shutdown();
   capture_mode_session_.reset();
 
   delegate_->OnSessionStateChanged(/*started=*/false);

diff --git a/ash/capture_mode/capture_mode_controller.h b/ash/capture_mode/capture_mode_controller.h
@@ -65,7 +65,7 @@ class ASH_EXPORT CaptureModeController
   bool is_recording_in_progress() const { return is_recording_in_progress_; }
 
   // Returns true if a capture mode session is currently active.
-  bool IsActive() const { return !!capture_mode_session_; }
+  bool IsActive() const;
 
   // Sets the capture source/type, which will be applied to an ongoing capture
   // session (if any), or to a future capture session when Start() is called.

diff --git a/ash/capture_mode/capture_mode_session.cc b/ash/capture_mode/capture_mode_session.cc
@@ -314,6 +314,10 @@ int GetMessageIdForCaptureSource(CaptureModeSource source,
   }
 }
 
+void UpdateAutoclickMenuBoundsIfNeeded() {
+  Shell::Get()->accessibility_controller()->UpdateAutoclickMenuBoundsIfNeeded();
+}
+
 }  // namespace
 
 // -----------------------------------------------------------------------------
@@ -492,7 +496,11 @@ CaptureModeSession::CaptureModeSession(CaptureModeController* controller)
       current_root_(GetPreferredRootWindow()),
       magnifier_glass_(kMagnifierParams),
       cursor_setter_(std::make_unique<CursorSetter>()),
-      focus_cycler_(std::make_unique<CaptureModeSessionFocusCycler>(this)) {
+      focus_cycler_(std::make_unique<CaptureModeSessionFocusCycler>(this)) {}
+
+CaptureModeSession::~CaptureModeSession() = default;
+
+void CaptureModeSession::Initialize() {
   // A context menu may have input capture when entering a session. Remove
   // capture from it, otherwise subsequent mouse events will cause it to close,
   // and then we won't be able to take a screenshot of the menu. Store it so we
@@ -563,9 +571,12 @@ CaptureModeSession::CaptureModeSession(CaptureModeController* controller)
           controller_->type() == CaptureModeType::kImage
               ? IDS_ASH_SCREEN_CAPTURE_TYPE_SCREENSHOT
               : IDS_ASH_SCREEN_CAPTURE_TYPE_SCREEN_RECORDING)));
+  UpdateAutoclickMenuBoundsIfNeeded();
 }
 
-CaptureModeSession::~CaptureModeSession() {
+void CaptureModeSession::Shutdown() {
+  is_shutting_down_ = true;
+
   aura::Env::GetInstance()->RemovePreTargetHandler(this);
   display::Screen::GetScreen()->RemoveObserver(this);
   current_root_->RemoveObserver(this);
@@ -595,6 +606,7 @@ CaptureModeSession::~CaptureModeSession() {
     capture_mode_util::TriggerAccessibilityAlert(
         IDS_ASH_SCREEN_CAPTURE_ALERT_CLOSE);
   }
+  UpdateAutoclickMenuBoundsIfNeeded();
 }
 
 aura::Window* CaptureModeSession::GetSelectedWindow() const {

diff --git a/ash/capture_mode/capture_mode_session.h b/ash/capture_mode/capture_mode_session.h
@@ -65,11 +65,23 @@ class ASH_EXPORT CaptureModeSession : public ui::LayerOwner,
   static constexpr int kCaptureButtonDistanceFromRegionDp = 24;
 
   aura::Window* current_root() const { return current_root_; }
+  views::Widget* capture_mode_bar_widget() {
+    return capture_mode_bar_widget_.get();
+  }
   bool is_selecting_region() const { return is_selecting_region_; }
   bool is_drag_in_progress() const { return is_drag_in_progress_; }
   void set_a11y_alert_on_session_exit(bool value) {
     a11y_alert_on_session_exit_ = value;
   }
+  bool is_shutting_down() const { return is_shutting_down_; }
+
+  // Initializes the capture mode session. This should be called right after the
+  // object is created.
+  void Initialize();
+
+  // Shuts down the capture mode session. This should be called right before the
+  // object is destroyed.
+  void Shutdown();
 
   // Gets the current window selected for |kWindow| capture source. Returns
   // nullptr if no window is available for selection.
@@ -333,6 +345,9 @@ class ASH_EXPORT CaptureModeSession : public ui::LayerOwner,
   // False only when we end the session to start recording.
   bool a11y_alert_on_session_exit_ = true;
 
+  // True once Shutdown() is called.
+  bool is_shutting_down_ = false;
+
   // The object which handles tab focus while in a capture session.
   std::unique_ptr<CaptureModeSessionFocusCycler> focus_cycler_;
 

diff --git a/ash/capture_mode/capture_mode_unittests.cc b/ash/capture_mode/capture_mode_unittests.cc
@@ -199,10 +199,6 @@ class CaptureModeSessionTestApi {
     return session_->capture_mode_bar_view_;
   }
 
-  views::Widget* capture_mode_bar_widget() const {
-    return session_->capture_mode_bar_widget_.get();
-  }
-
   CaptureModeSettingsView* capture_mode_settings_view() const {
     return session_->capture_mode_settings_view_;
   }
@@ -265,7 +261,7 @@ class CaptureModeTest : public AshTestBase {
   views::Widget* GetCaptureModeBarWidget() const {
     auto* session = CaptureModeController::Get()->capture_mode_session();
     DCHECK(session);
-    return CaptureModeSessionTestApi(session).capture_mode_bar_widget();
+    return session->capture_mode_bar_widget();
   }
 
   views::Widget* GetCaptureModeLabelWidget() const {
@@ -511,8 +507,7 @@ TEST_F(CaptureModeTest, StartStop) {
 
   // Closing the session should close the native window of capture mode bar
   // immediately.
-  CaptureModeSessionTestApi test_api(controller->capture_mode_session());
-  auto* bar_window = test_api.capture_mode_bar_widget()->GetNativeWindow();
+  auto* bar_window = GetCaptureModeBarWidget()->GetNativeWindow();
   aura::WindowTracker tracker({bar_window});
   controller->Stop();
   EXPECT_TRUE(tracker.windows().empty());

diff --git a/ash/wm/always_on_top_controller.cc b/ash/wm/always_on_top_controller.cc
@@ -42,6 +42,11 @@ AlwaysOnTopController::~AlwaysOnTopController() {
   DCHECK(!pip_container_);
 }
 
+// static
+void AlwaysOnTopController::SetDisallowReparent(aura::Window* window) {
+  window->SetProperty(kDisallowReparentKey, true);
+}
+
 aura::Window* AlwaysOnTopController::GetContainer(aura::Window* window) const {
   DCHECK(always_on_top_container_);
   DCHECK(pip_container_);
@@ -78,10 +83,6 @@ void AlwaysOnTopController::SetLayoutManagerForTest(
   always_on_top_container_->SetLayoutManager(layout_manager.release());
 }
 
-void AlwaysOnTopController::SetDisallowReparent(aura::Window* window) {
-  window->SetProperty(kDisallowReparentKey, true);
-}
-
 void AlwaysOnTopController::AddWindow(aura::Window* window) {
   window->AddObserver(this);
   WindowState::Get(window)->AddObserver(this);

diff --git a/ash/wm/always_on_top_controller.h b/ash/wm/always_on_top_controller.h
@@ -27,14 +27,14 @@ class ASH_EXPORT AlwaysOnTopController : public aura::WindowObserver,
                                  aura::Window* pip_container);
   ~AlwaysOnTopController() override;
 
+  static void SetDisallowReparent(aura::Window* window);
+
   // Gets container for given |window| based on its "AlwaysOnTop" property.
   aura::Window* GetContainer(aura::Window* window) const;
 
   void SetLayoutManagerForTest(
       std::unique_ptr<WorkspaceLayoutManager> layout_manager);
 
-  static void SetDisallowReparent(aura::Window* window);
-
  private:
   void AddWindow(aura::Window* window);
   void RemoveWindow(aura::Window* window);

diff --git a/ash/wm/collision_detection/collision_detection_utils.cc b/ash/wm/collision_detection/collision_detection_utils.cc
@@ -4,7 +4,10 @@
 
 #include "ash/wm/collision_detection/collision_detection_utils.h"
 
+#include "ash/capture_mode/capture_mode_controller.h"
+#include "ash/capture_mode/capture_mode_session.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
+#include "ash/public/cpp/ash_features.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shelf/shelf.h"
@@ -152,6 +155,19 @@ std::vector<gfx::Rect> CollectCollisionRects(
         /*parent=*/root_window));
   }
 
+  // Check the capture bar if capture mode is active.
+  if (features::IsCaptureModeEnabled()) {
+    auto* capture_mode_controller = CaptureModeController::Get();
+    if (capture_mode_controller->IsActive()) {
+      aura::Window* capture_bar_window =
+          capture_mode_controller->capture_mode_session()
+              ->capture_mode_bar_widget()
+              ->GetNativeWindow();
+      rects.push_back(ComputeCollisionRectFromBounds(
+          capture_bar_window->GetTargetBounds(), capture_bar_window->parent()));
+    }
+  }
+
   return rects;
 }
 

diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h
@@ -153,7 +153,7 @@ class ASH_EXPORT WorkspaceLayoutManager : public aura::LayoutManager,
 
   // Notifies windows about a change in a system ui area. This could be
   // the keyboard or any window in the SettingsBubbleContainer or
-  // accessibility_bubble_container_. Windows will only be notified about
+  // |accessibility_bubble_container_|. Windows will only be notified about
   // changes to system ui areas on the display they are on.
   void NotifySystemUiAreaChanged();