mash: Fix system tray bubble not closing for clicks outside its bounds

services/ui/public/cpp/tests/window_tree_client_unittest.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 "services/ui/public/cpp/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 35 matching lines @@
   memcpy(&transport_value.front(), &(bytes.front()), bytes.size());
   return transport_value;
 }
 
 class TestWindowTreeClientDelegate : public WindowTreeClientDelegate {
  public:
   TestWindowTreeClientDelegate() {}
   ~TestWindowTreeClientDelegate() override {}
 
   ui::Event* last_event_observed() { return last_event_observed_.get(); }
+  Window* last_target() { return last_target_; }
 
-  void Reset() { last_event_observed_.reset(); }
+  void Reset() {
+    last_event_observed_.reset();
+    last_target_ = nullptr;
+  }
 
   // WindowTreeClientDelegate:
   void OnEmbed(Window* root) override {}
   void OnDidDestroyClient(WindowTreeClient* client) override {}
   void OnEventObserved(const ui::Event& event, Window* target) override {
     last_event_observed_ = ui::Event::Clone(event);
+    last_target_ = target;
   }
 
  private:
   std::unique_ptr<ui::Event> last_event_observed_;
+  Window* last_target_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientDelegate);
 };
 
 class WindowTreeSetup {
  public:
   WindowTreeSetup() : tree_client_(&window_tree_delegate_, nullptr, nullptr) {
     WindowTreeClientPrivate(&tree_client_).OnEmbed(&window_tree_);
     window_tree_.GetAndClearChangeId(nullptr);
   }
@@ skipping 396 matching lines @@
   ASSERT_TRUE(root);
 
   // Set up an event observer.
   mojom::EventMatcherPtr matcher = mojom::EventMatcher::New();
   matcher->type_matcher = mojom::EventTypeMatcher::New();
   matcher->type_matcher->type = ui::mojom::EventType::POINTER_DOWN;
   setup.client()->SetEventObserver(std::move(matcher));
 
   // Simulate the server sending an observed event.
   uint32_t event_observer_id = setup.GetEventObserverId();
-  std::unique_ptr<ui::Event> ui_event(
-      new ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
-                         ui::EventTimeForNow(), ui::EF_CONTROL_DOWN, 0));
-  setup.window_tree_client()->OnEventObserved(ui::Event::Clone(*ui_event.get()),
+  ui::PointerEvent ui_event(
+      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      ui::EventTimeForNow());
+  setup.window_tree_client()->OnEventObserved(ui::Event::Clone(ui_event),
                                               event_observer_id);
 
-  // Delegate sensed the event.
+  // Delegate sensed the event and it has been converted to a mouse down.
   ui::Event* last_event = setup.window_tree_delegate()->last_event_observed();
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, last_event->type());
   EXPECT_EQ(ui::EF_CONTROL_DOWN, last_event->flags());
+  // There was no target window.
+  EXPECT_FALSE(setup.window_tree_delegate()->last_target());
   setup.window_tree_delegate()->Reset();
 
   // Clear the event observer.
   setup.client()->SetEventObserver(nullptr);
 
   // Simulate another event from the server.
-  setup.window_tree_client()->OnEventObserved(ui::Event::Clone(*ui_event.get()),
+  setup.window_tree_client()->OnEventObserved(ui::Event::Clone(ui_event),
                                               event_observer_id);
 
   // No event was sensed.
   EXPECT_FALSE(setup.window_tree_delegate()->last_event_observed());
 }
 
 // Tests event observers triggered by events that hit this window tree.
 TEST_F(WindowTreeClientTest, OnWindowInputEventWithEventObserver) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
 
   // Set up an event observer.
   mojom::EventMatcherPtr matcher = mojom::EventMatcher::New();
   matcher->type_matcher = mojom::EventTypeMatcher::New();
   matcher->type_matcher->type = ui::mojom::EventType::POINTER_DOWN;
   setup.client()->SetEventObserver(std::move(matcher));
 
   // Simulate the server dispatching an event that also matched the observer.
   uint32_t event_observer_id = setup.GetEventObserverId();
-  std::unique_ptr<ui::Event> ui_event(
-      new ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
-                         ui::EventTimeForNow(), ui::EF_CONTROL_DOWN, 0));
+  std::unique_ptr<ui::Event> ui_event(new ui::PointerEvent(
+      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      ui::EventTimeForNow()));
   setup.window_tree_client()->OnWindowInputEvent(
       1, server_id(root), std::move(ui_event), event_observer_id);
 
   // Delegate sensed the event.
   ui::Event* last_event = setup.window_tree_delegate()->last_event_observed();
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, last_event->type());
   EXPECT_EQ(ui::EF_CONTROL_DOWN, last_event->flags());
+  // Delegate sensed the target window.
+  EXPECT_EQ(root, setup.window_tree_delegate()->last_target());
 }
 
 // Tests that replacing an event observer with a new one results in only new
 // events being observed.
 TEST_F(WindowTreeClientTest, EventObserverReplaced) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
 
   // Set up an event observer.
   mojom::EventMatcherPtr matcher1 = mojom::EventMatcher::New();
   matcher1->type_matcher = mojom::EventTypeMatcher::New();
   matcher1->type_matcher->type = ui::mojom::EventType::POINTER_DOWN;
   setup.client()->SetEventObserver(std::move(matcher1));
   uint32_t event_observer_id1 = setup.GetEventObserverId();
 
   // Replace it with a second observer.
   mojom::EventMatcherPtr matcher2 = mojom::EventMatcher::New();
   matcher2->type_matcher = mojom::EventTypeMatcher::New();
   matcher2->type_matcher->type = ui::mojom::EventType::POINTER_UP;
   setup.client()->SetEventObserver(std::move(matcher2));
   uint32_t event_observer_id2 = setup.GetEventObserverId();
 
   // Simulate the server sending an observed event that matched the old observer
   // (e.g. that was in-flight when the observer was replaced).
-  std::unique_ptr<ui::Event> pressed_event(
-      new ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
-                         ui::EventTimeForNow(), ui::EF_NONE, 0));
+  std::unique_ptr<ui::Event> pressed_event(new ui::PointerEvent(
+      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      ui::EventTimeForNow()));
   setup.window_tree_client()->OnEventObserved(std::move(pressed_event),
                                               event_observer_id1);
 
   // The event was not sensed, because it does not match the current observer.
   EXPECT_FALSE(setup.window_tree_delegate()->last_event_observed());
 
   // Simulate another event that matches the new observer.
-  std::unique_ptr<ui::Event> released_event(
-      new ui::MouseEvent(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
-                         ui::EventTimeForNow(), ui::EF_CONTROL_DOWN, 0));
+  std::unique_ptr<ui::Event> released_event(new ui::PointerEvent(
+      ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      ui::EventTimeForNow()));
   setup.window_tree_client()->OnEventObserved(std::move(released_event),
                                               event_observer_id2);
 
   // The delegate sensed the event.
   ui::Event* last_event = setup.window_tree_delegate()->last_event_observed();
   EXPECT_EQ(ui::ET_MOUSE_RELEASED, last_event->type());
   EXPECT_EQ(ui::EF_CONTROL_DOWN, last_event->flags());
 }
 
 // Verifies focus is reverted if the server replied that the change failed.
@@ skipping 463 matching lines @@
 
   // Create a new Window, and attempt to place capture on that.
   Window* child = setup.client()->NewWindow();
   child->SetVisible(true);
   root->AddChild(child);
   child->SetCapture();
   EXPECT_TRUE(child->HasCapture());
 }
 
 }  // namespace ui