Converts mash to use Shell

ash/mus/root_window_controller.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 "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 58 matching lines @@
 
 RootWindowController::RootWindowController(
     WindowManager* window_manager,
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display,
     ash::RootWindowController::RootWindowType root_window_type)
     : window_manager_(window_manager),
       window_tree_host_(window_tree_host.get()),
       window_count_(0),
       display_(display) {
-  ash::InitRootWindowSettings(window_tree_host->window());
+  ash::InitRootWindowSettings(window_tree_host->window())->display_id =

[James Cook, 2017/01/18 01:00:24]

nit: This would be clearer if the result of InitRootWindowSettings() went into a
local variable.

[sky, 2017/01/18 04:00:07]

Done.

+      display.id();
   window_tree_host->window()->SetProperty(kRootWindowControllerKey, this);
-  WmShellMus::Get()->AddRootWindowController(this);
   ash_root_window_controller_ = base::WrapUnique(
       new ash::RootWindowController(nullptr, window_tree_host.release()));
   ash_root_window_controller_->Init(root_window_type);
 
+  // TODO: To avoid lots of IPC AddActivationParent() should take an array.
+  // http://crbug.com/682048.
   for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
     window_manager_->window_manager_client()->AddActivationParent(
         GetWindowByShellWindowId(kActivatableShellWindowIds[i])->aura_window());
   }
 }
 
 RootWindowController::~RootWindowController() {
   Shutdown();
   ash_root_window_controller_.reset();
-  WmShellMus::Get()->RemoveRootWindowController(this);
 }
 
 // static
 RootWindowController* RootWindowController::ForWindow(aura::Window* window) {
   return window->GetRootWindow()->GetProperty(kRootWindowControllerKey);
 }
 
 void RootWindowController::Shutdown() {
   // NOTE: Shutdown() may be called multiple times.
   ash_root_window_controller_->Shutdown();
@@ skipping 128 matching lines @@
   } else {
     width = root()->bounds().width() - 240;
     height = root()->bounds().height() - 240;
   }
   return gfx::Rect(40 + (window_count_ % 4) * 40, 40 + (window_count_ % 4) * 40,
                    width, height);
 }
 
 }  // namespace mus
 }  // namespace ash