Change FocusSynchronizer to maintain active focus client and window.

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/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/transient_window_client.h"
-#include "ui/aura/env.h"
+#include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/window_port_mus.h"
+#include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/mus/mus_property_mirror.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
@@ skipping 157 matching lines @@
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const cc::FrameSinkId& frame_sink_id,
     const std::map<std::string, std::vector<uint8_t>>* mus_properties)
     : aura::WindowTreeHostMus(MusClient::Get()->window_tree_client(),
                               frame_sink_id,
                               mus_properties),
       native_widget_delegate_(native_widget_delegate),
       desktop_native_widget_aura_(desktop_native_widget_aura),
       close_widget_factory_(this) {
-  aura::Env::GetInstance()->AddObserver(this);
   MusClient::Get()->AddObserver(this);
+  MusClient::Get()->window_tree_client()->focus_synchronizer()->AddObserver(
+      this);
   native_widget_delegate_->AsWidget()->AddObserver(this);
   desktop_native_widget_aura_->content_window()->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);
   desktop_native_widget_aura_->content_window()->RemoveObserver(this);
   native_widget_delegate_->AsWidget()->RemoveObserver(this);
   MusClient::Get()->RemoveObserver(this);
-  aura::Env::GetInstance()->RemoveObserver(this);
+  MusClient::Get()->window_tree_client()->focus_synchronizer()->RemoveObserver(
+      this);
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
 }
 
 void DesktopWindowTreeHostMus::SendClientAreaToServer() {
   if (!ShouldSendClientAreaToServer())
     return;
 
   NonClientView* non_client_view =
       native_widget_delegate_->AsWidget()->non_client_view();
   if (!non_client_view || !non_client_view->client_view())
@@ skipping 296 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::Activate() {
   if (!IsVisible())
     return;
 
   // This should result in OnActiveFocusClientChanged() being called, which
   // triggers a call to DesktopNativeWidgetAura::HandleActivationChanged(),
   // which focuses the right window.
-  aura::Env::GetInstance()->SetActiveFocusClient(
-      aura::client::GetFocusClient(window()), window());
+  MusClient::Get()
+      ->window_tree_client()
+      ->focus_synchronizer()
+      ->SetActiveFocusClient(aura::client::GetFocusClient(window()), window());
   if (is_active_)
     window()->SetProperty(aura::client::kDrawAttentionKey, false);
 }
 
 void DesktopWindowTreeHostMus::Deactivate() {
   if (is_active_)
     DeactivateWindow();
 }
 
 bool DesktopWindowTreeHostMus::IsActive() const {
@@ skipping 184 matching lines @@
 
 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::OnActiveFocusClientChanged(
+    aura::client::FocusClient* focus_client,
+    aura::Window* focus_client_root) {
+  if (focus_client_root == this->window()) {
+    desktop_native_widget_aura_->HandleActivationChanged(true);
+  } else if (is_active_) {
+    desktop_native_widget_aura_->HandleActivationChanged(false);
+  }
+}
+
 void DesktopWindowTreeHostMus::OnWindowPropertyChanged(aura::Window* window,
                                                        const void* key,
                                                        intptr_t old) {
   DCHECK_EQ(window, desktop_native_widget_aura_->content_window());
   DCHECK(!window->GetRootWindow() || this->window() == window->GetRootWindow());
   if (!this->window())
     return;
 
   // Allow mus clients to mirror widget window properties to their root windows.
   MusPropertyMirror* property_mirror = MusClient::Get()->mus_property_mirror();
@@ skipping 32 matching lines @@
     final_bounds_in_pixels.set_size(size);
   }
   const gfx::Rect old_bounds_in_pixels = GetBoundsInPixels();
   WindowTreeHostMus::SetBoundsInPixels(final_bounds_in_pixels);
   if (old_bounds_in_pixels.size() != final_bounds_in_pixels.size()) {
     SendClientAreaToServer();
     SendHitTestMaskToServer();
   }
 }
 
-void DesktopWindowTreeHostMus::OnWindowInitialized(aura::Window* window) {}
-
-void DesktopWindowTreeHostMus::OnActiveFocusClientChanged(
-    aura::client::FocusClient* focus_client,
-    aura::Window* window) {
-  if (window == this->window()) {
-    desktop_native_widget_aura_->HandleActivationChanged(true);
-  } else if (is_active_) {
-    desktop_native_widget_aura_->HandleActivationChanged(false);
-  }
-}
-
 }  // namespace views