Moves maintaining root_window_for_new_windows_ to Shell

ash/shell.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 226 matching lines @@
   return root_window ? root_window->GetRootWindowController() : nullptr;
 }
 
 // static
 aura::Window* Shell::GetPrimaryRootWindow() {
   CHECK(HasInstance());
   return instance_->wm_shell_->GetPrimaryRootWindow()->aura_window();
 }
 
 // static
 aura::Window* Shell::GetTargetRootWindow() {

[James Cook, 2017/03/08 03:04:15]

Hrm, though now it's confusing that we have both. Do you think these two methods
will eventually collapse?

[sky, 2017/03/08 17:01:38]

Indeed. I renamed this to GetRootWindowForNewWindows and added
GetWmRootWindowForNewWindows. The later is temporary while WmWindow exists.

   CHECK(WmShell::HasInstance());
-  return WmWindow::GetAuraWindow(WmShell::Get()->GetRootWindowForNewWindows());
+  return WmWindow::GetAuraWindow(
+      Shell::GetInstance()->GetRootWindowForNewWindows());
 }
 
 // static
 int64_t Shell::GetTargetDisplayId() {
   return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(GetTargetRootWindow())
       .id();
 }
 
 // static
@@ skipping 109 matching lines @@
 
 void Shell::SetTouchHudProjectionEnabled(bool enabled) {
   if (is_touch_hud_projection_enabled_ == enabled)
     return;
 
   is_touch_hud_projection_enabled_ = enabled;
   for (auto& observer : *wm_shell_->shell_observers())
     observer.OnTouchHudProjectionToggled(enabled);
 }
 
+WmWindow* Shell::GetRootWindowForNewWindows() {
+  if (scoped_root_window_for_new_windows_)
+    return scoped_root_window_for_new_windows_;
+  return root_window_for_new_windows_;
+}
+
 FirstRunHelper* Shell::CreateFirstRunHelper() {
   return new FirstRunHelperImpl;
 }
 
 void Shell::SetLargeCursorSizeInDip(int large_cursor_size_in_dip) {
   window_tree_host_manager_->cursor_window_controller()
       ->SetLargeCursorSizeInDip(large_cursor_size_in_dip);
 }
 
 void Shell::SetCursorCompositingEnabled(bool enabled) {
@@ skipping 284 matching lines @@
 
   env_filter_.reset(new ::wm::CompoundEventFilter);
   AddPreTargetHandler(env_filter_.get());
 
   wm::AshFocusRules* focus_rules = new wm::AshFocusRules();
 
   ::wm::FocusController* focus_controller =
       new ::wm::FocusController(focus_rules);
   focus_client_.reset(focus_controller);
   activation_client_ = focus_controller;
-  // TODO(sky): Shell should implement ActivationChangeObserver, not WmShell.
-  activation_client_->AddObserver(wm_shell_.get());
+  activation_client_->AddObserver(this);

[James Cook, 2017/03/08 03:04:15]

Where is this observer removed?

[sky, 2017/03/08 17:01:38]

Looking back at the history AFAICT the code never removed itself. I've added the
removal.

 
   screen_position_controller_.reset(new ScreenPositionController);
 
   wm_shell_->CreatePrimaryHost();
-  wm_shell_->set_root_window_for_new_windows(
-      WmWindow::Get(GetPrimaryRootWindow()));
+  root_window_for_new_windows_ = WmWindow::Get(GetPrimaryRootWindow());
 
   if (!is_mash) {
     resolution_notification_controller_.reset(
         new ResolutionNotificationController);
   }
 
   if (cursor_manager_) {
     cursor_manager_->SetDisplay(
         display::Screen::GetScreen()->GetPrimaryDisplay());
   }
@@ skipping 251 matching lines @@
 
 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
   return std::unique_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
+void Shell::OnWindowActivated(
+    aura::client::ActivationChangeObserver::ActivationReason reason,
+    aura::Window* gained_active,
+    aura::Window* lost_active) {
+  // TODO(sky): Shell should implement ActivationChangeObserver, not WmShell.

[James Cook, 2017/03/08 03:04:15]

This TODO looks TODONE.

[sky, 2017/03/08 17:01:38]

Done.

+  WmWindow* gained_active_wm = WmWindow::Get(gained_active);
+  if (gained_active_wm)
+    root_window_for_new_windows_ = gained_active_wm->GetRootWindow();
+}
+
 }  // namespace ash