chromeos: Promotes more from WmShell to Shell

ash/mus/bridge/wm_shell_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 "ash/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/key_event_watcher.h"
@@ skipping 97 matching lines @@
   // A pseudo user info.
   std::unique_ptr<user_manager::UserInfo> user_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
 WmShellMus::WmShellMus(
     WmWindow* primary_root_window,
-    std::unique_ptr<ShellDelegate> shell_delegate,
     WindowManager* window_manager,
     views::PointerWatcherEventRouter* pointer_watcher_event_router,
     bool create_session_state_delegate_stub)
-    : WmShell(std::move(shell_delegate)),
+    : WmShell(),

[James Cook, 2017/03/11 00:40:43]

nit: I don't think this line is needed.

[sky, 2017/03/13 15:23:19]

Done.

       window_manager_(window_manager),
       primary_root_window_(primary_root_window),
       pointer_watcher_event_router_(pointer_watcher_event_router) {
   if (create_session_state_delegate_stub)
     session_state_delegate_ = base::MakeUnique<SessionStateDelegateStub>();
   DCHECK(primary_root_window_);
-  WmShell::Set(this);
 
   uint16_t accelerator_namespace_id = 0u;
   const bool add_result =
       window_manager->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
   // WmShellMus is created early on, so that this should always succeed.
   DCHECK(add_result);
   accelerator_controller_delegate_.reset(
       new AcceleratorControllerDelegateMus(window_manager_));
   accelerator_controller_registrar_.reset(new AcceleratorControllerRegistrar(
       window_manager_, accelerator_namespace_id));
   SetAcceleratorController(base::MakeUnique<AcceleratorController>(
       accelerator_controller_delegate_.get(),
       accelerator_controller_registrar_.get()));
   immersive_handler_factory_.reset(new ImmersiveHandlerFactoryMus);
 
   SetKeyboardUI(KeyboardUIMus::Create(window_manager_->connector()));
 }
 
 WmShellMus::~WmShellMus() {
-  WmShell::Set(nullptr);
 }
 
 // static
 WmShellMus* WmShellMus::Get() {
   return static_cast<WmShellMus*>(WmShell::Get());
 }
 
 RootWindowController* WmShellMus::GetRootWindowControllerWithDisplayId(
     int64_t id) {
   for (RootWindowController* root_window_controller :
@@ skipping 234 matching lines @@
 }
 
 void WmShellMus::CreatePrimaryHost() {}
 
 void WmShellMus::InitHosts(const ShellInitParams& init_params) {
   window_manager_->CreatePrimaryRootWindowController(
       base::WrapUnique(init_params.primary_window_tree_host));
 }
 }  // namespace mus
 }  // namespace ash