aura-mus: Implement Deactivate().

ui/views/mus/desktop_window_tree_host_mus.cc

 // Copyright 2016 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/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 163 matching lines @@
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const std::map<std::string, std::vector<uint8_t>>* mus_properties)
     : aura::WindowTreeHostMus(MusClient::Get()->window_tree_client(),
                               mus_properties),
       native_widget_delegate_(native_widget_delegate),
       desktop_native_widget_aura_(desktop_native_widget_aura),
       fullscreen_restore_state_(ui::SHOW_STATE_DEFAULT),
       close_widget_factory_(this) {
   aura::Env::GetInstance()->AddObserver(this);
   MusClient::Get()->AddObserver(this);
+  native_widget_delegate_->AsWidget()->AddObserver(this);
   // DesktopNativeWidgetAura registers the association between |content_window_|
   // and Widget, but code may also want to go from the root (window()) to the
   // Widget. This call enables that.
   NativeWidgetAura::RegisterNativeWidgetForWindow(desktop_native_widget_aura,
                                                   window());
   // TODO: use display id and bounds if available, likely need to pass in
   // InitParams for that.
 }
 
 DesktopWindowTreeHostMus::~DesktopWindowTreeHostMus() {
   // The cursor-client can be accessed during WindowTreeHostMus tear-down. So
   // the cursor-client needs to be unset on the root-window before
   // |cursor_manager_| is destroyed.
   aura::client::SetCursorClient(window(), nullptr);
+  native_widget_delegate_->AsWidget()->RemoveObserver(this);
   MusClient::Get()->RemoveObserver(this);
   aura::Env::GetInstance()->RemoveObserver(this);
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
 }
 
 bool DesktopWindowTreeHostMus::IsDocked() const {
   return window()->GetProperty(aura::client::kShowStateKey) ==
          ui::SHOW_STATE_DOCKED;
 }
 
@@ skipping 65 matching lines @@
 
 void DesktopWindowTreeHostMus::OnNativeWidgetCreated(
     const Widget::InitParams& params) {
   if (params.parent && params.parent->GetHost()) {
     parent_ = static_cast<DesktopWindowTreeHostMus*>(params.parent->GetHost());
     parent_->children_.insert(this);
   }
   native_widget_delegate_->OnNativeWidgetCreated(true);
 }
 
+void DesktopWindowTreeHostMus::OnNativeWidgetActivationChanged(bool active) {
+  // In Mus, when our aura Window receives an activation signal, it can be
+  // because of remote messages. We need to forward that to Widget so that
+  // Widget can notify everyone listening for that signal.
+  native_widget_delegate_->OnNativeWidgetActivationChanged(active);
+}
+
 void DesktopWindowTreeHostMus::OnWidgetInitDone() {
   // Because of construction order it's possible the bounds have changed before
   // the NonClientView was created, which means we may not have sent the
   // client-area and hit-test-mask.
   SendClientAreaToServer();
   SendHitTestMaskToServer();
 }
 
 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostMus::CreateTooltip() {
   return base::MakeUnique<corewm::TooltipAura>();
@@ skipping 192 matching lines @@
   aura::Env::GetInstance()->SetActiveFocusClient(
       aura::client::GetFocusClient(window()), window());
   if (is_active_) {
     window()->Focus();
     if (window()->GetProperty(aura::client::kDrawAttentionKey))
       window()->SetProperty(aura::client::kDrawAttentionKey, false);
   }
 }
 
 void DesktopWindowTreeHostMus::Deactivate() {
-  // TODO: Deactivate() means focus next window, that needs to go to mus.
-  // http://crbug.com/663618.
-  NOTIMPLEMENTED();
+  if (is_active_)
+    DeactivateWindow();
 }
 
 bool DesktopWindowTreeHostMus::IsActive() const {
   return is_active_;
 }
 
 void DesktopWindowTreeHostMus::Maximize() {
   window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 void DesktopWindowTreeHostMus::Minimize() {
@@ skipping 154 matching lines @@
       native_widget_delegate_->AsWidget()->non_client_view();
   if (non_client_view) {
     non_client_view->Layout();
     non_client_view->SchedulePaint();
   }
 
   SendClientAreaToServer();
   SendHitTestMaskToServer();
 }
 
+void DesktopWindowTreeHostMus::OnWidgetActivationChanged(Widget* widget,
+                                                         bool active) {
+  // TODO(erg): Theoretically, this shouldn't be necessary. We should be able
+  // to just set |is_active_| in OnNativeWidgetActivationChanged() above,
+  // instead of asking the Widget to change the activation and have the widget
+  // then tell us the activation has changed. But if we do that, focus breaks.
+  is_active_ = active;
+}
+
 void DesktopWindowTreeHostMus::ShowImpl() {
   native_widget_delegate_->OnNativeWidgetVisibilityChanging(true);
   // Using ui::SHOW_STATE_NORMAL matches that of DesktopWindowTreeHostX11.
   ShowWindowWithState(ui::SHOW_STATE_NORMAL);
   WindowTreeHostMus::ShowImpl();
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(true);
 }
 
 void DesktopWindowTreeHostMus::HideImpl() {
   native_widget_delegate_->OnNativeWidgetVisibilityChanging(false);
@@ skipping 22 matching lines @@
     SendHitTestMaskToServer();
   }
 }
 
 void DesktopWindowTreeHostMus::OnWindowInitialized(aura::Window* window) {}
 
 void DesktopWindowTreeHostMus::OnActiveFocusClientChanged(
     aura::client::FocusClient* focus_client,
     aura::Window* window) {
   if (window == this->window()) {
-    is_active_ = true;
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
-    is_active_ = false;
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views