Reland of Improves focus/activation for aura-mus and DesktopNativeWidgetAura

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 "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
+#include "ui/aura/env.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace views {
 
 DesktopWindowTreeHostMus::DesktopWindowTreeHostMus(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura)
     : aura::WindowTreeHostMus(MusClient::Get()->window_tree_client()),
       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);
   // TODO: use display id and bounds if available, likely need to pass in
   // InitParams for that.
 }
 
 DesktopWindowTreeHostMus::~DesktopWindowTreeHostMus() {
+  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;
 }
 
 void DesktopWindowTreeHostMus::Init(aura::Window* content_window,
                                     const Widget::InitParams& params) {}
@@ skipping 145 matching lines @@
       ->GetDisplayNearestWindow(const_cast<aura::Window*>(window()))
       .work_area();
 }
 
 void DesktopWindowTreeHostMus::SetShape(
     std::unique_ptr<SkRegion> native_region) {
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::Activate() {
-  window()->Focus();
-  if (window()->GetProperty(aura::client::kDrawAttentionKey))
-    window()->SetProperty(aura::client::kDrawAttentionKey, false);
+  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() {
-  aura::client::GetActivationClient(window()->GetRootWindow())
-      ->DeactivateWindow(window());
+  // TODO: Deactivate() means focus next window, that needs to go to mus.
+  NOTIMPLEMENTED();
 }
 
 bool DesktopWindowTreeHostMus::IsActive() const {
-  return wm::IsActiveWindow(const_cast<aura::Window*>(window()));
+  return is_active_;
 }
 
 void DesktopWindowTreeHostMus::Maximize() {
   window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 void DesktopWindowTreeHostMus::Minimize() {
   window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
 }
 
 void DesktopWindowTreeHostMus::Restore() {
@@ skipping 122 matching lines @@
 void DesktopWindowTreeHostMus::SizeConstraintsChanged() {
   Widget* widget = native_widget_delegate_->AsWidget();
   window()->SetProperty(aura::client::kCanMaximizeKey,
                         widget->widget_delegate()->CanMaximize());
   window()->SetProperty(aura::client::kCanMinimizeKey,
                         widget->widget_delegate()->CanMinimize());
   window()->SetProperty(aura::client::kCanResizeKey,
                         widget->widget_delegate()->CanResize());
 }
 
+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