mash: Close the system tray bubble on click outside its bounds

ui/views/mus/native_widget_mus.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/mus/native_widget_mus.h"
 
 #include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
@@ skipping 90 matching lines @@
                                  const gfx::Rect& bounds) override {
     return root_window_;
   }
 
  private:
   aura::Window* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetMusWindowTreeClient);
 };
 
+// A screen position client that applies the offset of the mus::Window.
+class ScreenPositionClientMus : public wm::DefaultScreenPositionClient {
+ public:
+  explicit ScreenPositionClientMus(mus::Window* mus_window)
+      : mus_window_(mus_window) {}
+  ~ScreenPositionClientMus() override {}
+
+  // wm::DefaultScreenPositionClient:
+  void ConvertPointToScreen(const aura::Window* window,
+                            gfx::Point* point) override {
+    wm::DefaultScreenPositionClient::ConvertPointToScreen(window, point);
+    gfx::Rect mus_bounds = mus_window_->GetBoundsInRoot();
+    point->Offset(-mus_bounds.x(), -mus_bounds.y());
+  }
+  void ConvertPointFromScreen(const aura::Window* window,
+                              gfx::Point* point) override {
+    gfx::Rect mus_bounds = mus_window_->GetBoundsInRoot();
+    point->Offset(mus_bounds.x(), mus_bounds.y());
+    wm::DefaultScreenPositionClient::ConvertPointFromScreen(window, point);
+  }
+
+ private:
+  mus::Window* mus_window_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScreenPositionClientMus);
+};
+
 // As the window manager renderers the non-client decorations this class does
 // very little but honor the client area insets from the window manager.
 class ClientSideNonClientFrameView : public NonClientFrameView {
  public:
   explicit ClientSideNonClientFrameView(views::Widget* widget)
       : widget_(widget) {}
   ~ClientSideNonClientFrameView() override {}
 
  private:
   // Returns the default values of client area insets from the window manager.
@@ skipping 269 matching lines @@
   window_tree_host_->AddObserver(this);
   window_tree_host_->InitHost();
   window_tree_host_->window()->SetProperty(kMusWindow, window_);
 
   focus_client_.reset(new wm::FocusController(new FocusRulesImpl));
 
   aura::client::SetFocusClient(window_tree_host_->window(),
                                focus_client_.get());
   aura::client::SetActivationClient(window_tree_host_->window(),
                                     focus_client_.get());
-  screen_position_client_.reset(new wm::DefaultScreenPositionClient());
+  screen_position_client_.reset(new ScreenPositionClientMus(window_));
   aura::client::SetScreenPositionClient(window_tree_host_->window(),
                                         screen_position_client_.get());
 
   window_tree_client_.reset(
       new NativeWidgetMusWindowTreeClient(window_tree_host_->window()));
   window_tree_host_->window()->AddPreTargetHandler(focus_client_.get());
   window_tree_host_->window()->SetLayoutManager(
       new ContentWindowLayoutManager(window_tree_host_->window(), content_));
   capture_client_.reset(
       new aura::client::DefaultCaptureClient(window_tree_host_->window()));
@@ skipping 607 matching lines @@
     window_tree_host_->Show();
     GetNativeWindow()->Show();
   } else {
     window_tree_host_->Hide();
     GetNativeWindow()->Hide();
   }
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible());
 }
 
 }  // namespace views