mash: Migrate ScopedTargetRootWindow to //ash/common

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 218 matching lines @@
 }
 
 // static
 aura::Window* Shell::GetPrimaryRootWindow() {
   CHECK(HasInstance());
   return GetInstance()->window_tree_host_manager()->GetPrimaryRootWindow();
 }
 
 // static
 aura::Window* Shell::GetTargetRootWindow() {
-  CHECK(HasInstance());
-  Shell* shell = GetInstance();
-  if (shell->scoped_target_root_window_)
-    return shell->scoped_target_root_window_;
-  return shell->target_root_window_;
+  CHECK(WmShell::HasInstance());
+  return WmWindowAura::GetAuraWindow(
+      WmShell::Get()->root_window_for_new_windows());
 }
 
 // static
 int64_t Shell::GetTargetDisplayId() {
   return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(GetTargetRootWindow())
       .id();
 }
 
 // static
@@ skipping 280 matching lines @@
   return GetPrimaryRootWindowController()
       ->workspace_controller()
       ->DoInitialAnimation();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool)
     : wm_shell_(new WmShellAura(base::WrapUnique(delegate))),
-      target_root_window_(nullptr),
-      scoped_target_root_window_(nullptr),
       link_handler_model_factory_(nullptr),
       activation_client_(nullptr),
 #if defined(OS_CHROMEOS)
       display_configurator_(new ui::DisplayConfigurator()),
 #endif  // defined(OS_CHROMEOS)
       native_cursor_manager_(nullptr),
       simulate_modal_window_open_for_testing_(false),
       is_touch_hud_projection_enabled_(false),
       blocking_pool_(blocking_pool) {
   DCHECK(aura::Env::GetInstanceDontCreate());
@@ skipping 265 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;
-  activation_client_->AddObserver(this);
 
   screen_position_controller_.reset(new ScreenPositionController);
 
   window_tree_host_manager_->Start();
   window_tree_host_manager_->CreatePrimaryHost(
       ShellInitParamsToAshWindowTreeHostInitParams(init_params));
   aura::Window* root_window = window_tree_host_manager_->GetPrimaryRootWindow();
-  target_root_window_ = root_window;
+  wm_shell_->set_root_window_for_new_windows(WmWindowAura::Get(root_window));

[msw, 2016/08/02 01:04:50]

optional nit: if (!in_mus())? (it may be okay to do this regardless)

[James Cook, 2016/08/02 16:16:04]

I think it's OK to do this regardless.

 
 #if defined(OS_CHROMEOS)
   resolution_notification_controller_.reset(
       new ResolutionNotificationController);
 #endif
 
   if (cursor_manager_)
     cursor_manager_->SetDisplay(
         display::Screen::GetScreen()->GetPrimaryDisplay());
 
@@ skipping 226 matching lines @@
 
 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
   return std::unique_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Shell, aura::client::ActivationChangeObserver implementation:
-
-void Shell::OnWindowActivated(
-    aura::client::ActivationChangeObserver::ActivationReason reason,
-    aura::Window* gained_active,
-    aura::Window* lost_active) {
-  if (gained_active)
-    target_root_window_ = gained_active->GetRootWindow();
-}
-
 }  // namespace ash