aura-mus: Implement Deactivate().

ui/views/mus/desktop_window_tree_host_mus_unittest.cc

Index: ui/views/mus/desktop_window_tree_host_mus_unittest.cc
diff --git a/ui/views/mus/desktop_window_tree_host_mus_unittest.cc b/ui/views/mus/desktop_window_tree_host_mus_unittest.cc
index 3bdfede047c5d7d6b345d7dab0bb3192d81b44d5..74ed9522f0f158176d4889a892fd37df63ca7669 100644
--- a/ui/views/mus/desktop_window_tree_host_mus_unittest.cc
+++ b/ui/views/mus/desktop_window_tree_host_mus_unittest.cc
@@ -4,18 +4,26 @@
 
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 
+#include "base/debug/stack_trace.h"
+
 #include "base/memory/ptr_util.h"
+#include "base/run_loop.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
+#include "ui/views/widget/widget_observer.h"
 
 namespace views {
 
-class DesktopWindowTreeHostMusTest : public ViewsTestBase {
+class DesktopWindowTreeHostMusTest : public ViewsTestBase,
+                                     public WidgetObserver {
  public:
-  DesktopWindowTreeHostMusTest() {}
+  DesktopWindowTreeHostMusTest()
+      : widget_activated_(nullptr),
+        widget_deactivated_(nullptr),
+        waiting_for_deactivate_(nullptr) {}
   ~DesktopWindowTreeHostMusTest() override {}
 
   // Creates a test widget. Takes ownership of |delegate|.
@@ -26,10 +34,45 @@ class DesktopWindowTreeHostMusTest : public ViewsTestBase {
     params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = gfx::Rect(0, 1, 111, 123);
     widget->Init(params);
+    widget->AddObserver(this);
     return widget;
   }
 
+  const Widget* widget_activated() const { return widget_activated_; }
+  const Widget* widget_deactivated() const { return widget_deactivated_; }
+
+  void DeactivateAndWait(Widget* to_deactivate) {
+    waiting_for_deactivate_ = to_deactivate;
+
+    base::RunLoop loop;
+    on_deactivate_ = loop.QuitClosure();
+
+    to_deactivate->Deactivate();
+    loop.Run();
+
+    waiting_for_deactivate_ = nullptr;
+  }
+
  private:
+  void OnWidgetActivationChanged(Widget* widget, bool active) override {
+    if (active) {
+      widget_activated_ = widget;
+    } else {
+      if (widget_activated_ == widget)
+        widget_activated_ = nullptr;
+      widget_deactivated_ = widget;
+
+      if (waiting_for_deactivate_ && waiting_for_deactivate_ == widget)
+        on_deactivate_.Run();
+    }
+  }
+
+  Widget* widget_activated_;
+  Widget* widget_deactivated_;
+
+  Widget* waiting_for_deactivate_;
+  base::Closure on_deactivate_;
+
   DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMusTest);
 };
 
@@ -76,6 +119,22 @@ TEST_F(DesktopWindowTreeHostMusTest, Visibility) {
   EXPECT_FALSE(widget->GetNativeView()->parent()->IsVisible());
 }
 
+TEST_F(DesktopWindowTreeHostMusTest, Deactivate) {
+  std::unique_ptr<Widget> widget1(CreateWidget(nullptr));
+  widget1->Show();
+
+  std::unique_ptr<Widget> widget2(CreateWidget(nullptr));
+  widget2->Show();
+
+  widget1->Activate();
+  RunPendingMessages();
+  EXPECT_TRUE(widget1->IsActive());
+  EXPECT_EQ(widget_activated(), widget1.get());
+
+  DeactivateAndWait(widget1.get());
+  EXPECT_FALSE(widget1->IsActive());
+}
+
 TEST_F(DesktopWindowTreeHostMusTest, CursorClientDuringTearDown) {
   std::unique_ptr<Widget> widget(CreateWidget(nullptr));
   widget->Show();