chromeos: Promotes more from WmShell to Shell

ash/aura/wm_shell_aura.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/aura/wm_shell_aura.h"
 
 #include <utility>
 
 #include "ash/aura/key_event_watcher_aura.h"
 #include "ash/aura/pointer_watcher_adapter.h"
@@ skipping 29 matching lines @@
 #if defined(USE_X11)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
 #endif
 
 namespace ash {
 
-WmShellAura::WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate)
-    : WmShell(std::move(shell_delegate)) {
-  WmShell::Set(this);
-}
+WmShellAura::WmShellAura() {}
 
-WmShellAura::~WmShellAura() {
-  WmShell::Set(nullptr);
-}
+WmShellAura::~WmShellAura() {}
 
 void WmShellAura::Shutdown() {
   if (added_display_observer_)
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 
   pointer_watcher_adapter_.reset();
 
   WmShell::Shutdown();
 
   Shell::GetInstance()->window_tree_host_manager()->Shutdown();
@@ skipping 219 matching lines @@
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash