Converts mash to use Shell

ash/root_window_controller.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/root_window_controller.h"
 
+#include <algorithm>
 #include <queue>
 #include <vector>
 
 #include "ash/ash_touch_exploration_manager_chromeos.h"
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 247 matching lines @@
     return true;
 
   aura::WindowMus* window_mus =
       aura::WindowMus::Get(WmWindow::GetAuraWindow(window));
   return Shell::window_tree_client()->WasCreatedByThisClient(window_mus) ||
          Shell::window_tree_client()->IsRoot(window_mus);
 }
 
 }  // namespace
 
+// static
+std::vector<RootWindowController*>*
+    RootWindowController::root_window_controllers_ = nullptr;
+
 RootWindowController::~RootWindowController() {
   Shutdown();
   ash_host_.reset();
   mus_window_tree_host_.reset();
   // The CaptureClient needs to be around for as long as the RootWindow is
   // valid.
   capture_client_.reset();
   if (animating_wallpaper_widget_controller_.get())
     animating_wallpaper_widget_controller_->StopAnimating();
+  root_window_controllers_->erase(std::find(root_window_controllers_->begin(),
+                                            root_window_controllers_->end(),
+                                            this));
 }
 
 void RootWindowController::CreateForPrimaryDisplay(AshWindowTreeHost* host) {
   RootWindowController* controller = new RootWindowController(host, nullptr);
   controller->Init(RootWindowType::PRIMARY);
 }
 
 void RootWindowController::CreateForSecondaryDisplay(AshWindowTreeHost* host) {
   RootWindowController* controller = new RootWindowController(host, nullptr);
   controller->Init(RootWindowType::SECONDARY);
@@ skipping 448 matching lines @@
 
 RootWindowController::RootWindowController(
     AshWindowTreeHost* ash_host,
     aura::WindowTreeHost* window_tree_host)
     : ash_host_(ash_host),
       mus_window_tree_host_(window_tree_host),
       window_tree_host_(ash_host ? ash_host->AsWindowTreeHost()
                                  : window_tree_host),
       wm_shelf_(base::MakeUnique<WmShelf>()) {
   DCHECK((ash_host && !window_tree_host) || (!ash_host && window_tree_host));
+
+  if (!root_window_controllers_)
+    root_window_controllers_ = new std::vector<RootWindowController*>;
+  root_window_controllers_->push_back(this);
+
   aura::Window* root_window = GetRootWindow();
   GetRootWindowSettings(root_window)->controller = this;
 
   stacking_controller_.reset(new StackingController);
   aura::client::SetWindowParentingClient(root_window,
                                          stacking_controller_.get());
   capture_client_.reset(new ::wm::ScopedCaptureClient(root_window));
 }
 
 void RootWindowController::Init(RootWindowType root_window_type) {
   aura::Window* root_window = GetRootWindow();
   WmShell* wm_shell = WmShell::Get();
-  Shell* shell = nullptr;
-  if (!wm_shell->IsRunningInMash()) {
-    shell = Shell::GetInstance();
-    shell->InitRootWindow(root_window);
-  }
+  Shell* shell = Shell::GetInstance();
+  shell->InitRootWindow(root_window);
 
   CreateContainers();
 
   CreateSystemWallpaper(root_window_type);
 
   InitLayoutManagers();
   InitTouchHuds();
 
   if (wm_shell->GetPrimaryRootWindowController()
           ->GetSystemModalLayoutManager(nullptr)
           ->has_window_dimmer()) {
     GetSystemModalLayoutManager(nullptr)->CreateModalBackground();
   }
 
   wm_shell->AddShellObserver(this);
 
   root_window_layout_manager_->OnWindowResized();
   if (root_window_type == RootWindowType::PRIMARY) {
     if (!wm_shell->IsRunningInMash())
       shell->InitKeyboard();
   } else {
     window_tree_host_->Show();
 
     // Create a shelf if a user is already logged in.
     if (wm_shell->GetSessionStateDelegate()->NumberOfLoggedInUsers())
       CreateShelf();
 
     // Notify shell observers about new root window.
-    if (!wm_shell->IsRunningInMash())
-      shell->OnRootWindowAdded(WmWindow::Get(root_window));
+    shell->OnRootWindowAdded(WmWindow::Get(root_window));
   }
 
   // TODO: AshTouchExplorationManager doesn't work with mus.
   // http://crbug.com/679782
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDisableTouchExplorationMode) &&
       !wm_shell->IsRunningInMash()) {
     touch_exploration_manager_.reset(new AshTouchExplorationManager(this));
   }
 }
@@ skipping 323 matching lines @@
     EnableTouchHudProjection();
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : nullptr;
 }
 
 }  // namespace ash