Folds methods in WmShellCommon to WmShell

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 "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
-#include "ash/common/wm_shell_common.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/wm/public/activation_client.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/virtual_keyboard_controller.h"
 #endif
 
 namespace ash {
 
-WmShellAura::WmShellAura(WmShellCommon* wm_shell_common)
-    : wm_shell_common_(wm_shell_common) {
+WmShellAura::WmShellAura() {
   WmShell::Set(this);
 }
 
 WmShellAura::~WmShellAura() {
   WmShell::Set(nullptr);
 }
 
 void WmShellAura::PrepareForShutdown() {
   if (added_activation_observer_)
     Shell::GetInstance()->activation_client()->RemoveObserver(this);
 
   if (added_display_observer_)
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 }
 
-MruWindowTracker* WmShellAura::GetMruWindowTracker() {
-  return wm_shell_common_->mru_window_tracker();
-}
-
 WmWindow* WmShellAura::NewContainerWindow() {
   aura::Window* aura_window = new aura::Window(nullptr);
   aura_window->Init(ui::LAYER_NOT_DRAWN);
   return WmWindowAura::Get(aura_window);
 }
 
 WmWindow* WmShellAura::GetFocusedWindow() {
   return WmWindowAura::Get(
       aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
           ->GetFocusedWindow());
@@ skipping 64 matching lines @@
   return base::WrapUnique(
       DragWindowResizer::Create(next_window_resizer.release(), window_state));
 }
 
 std::unique_ptr<wm::MaximizeModeEventHandler>
 WmShellAura::CreateMaximizeModeEventHandler() {
   return base::WrapUnique(new wm::MaximizeModeEventHandlerAura);
 }
 
 void WmShellAura::OnOverviewModeStarting() {
-  FOR_EACH_OBSERVER(ShellObserver, *wm_shell_common_->shell_observers(),
+  FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
                     OnOverviewModeStarting());
 }
 
 void WmShellAura::OnOverviewModeEnded() {
-  FOR_EACH_OBSERVER(ShellObserver, *wm_shell_common_->shell_observers(),
-                    OnOverviewModeEnded());
+  FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
 }
 
 AccessibilityDelegate* WmShellAura::GetAccessibilityDelegate() {
   return Shell::GetInstance()->accessibility_delegate();
 }
 
 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
   return Shell::GetInstance()->session_state_delegate();
 }
 
@@ skipping 14 matching lines @@
     added_display_observer_ = true;
     Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
   }
   display_observers_.AddObserver(observer);
 }
 
 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) {
   display_observers_.RemoveObserver(observer);
 }
 
-void WmShellAura::AddShellObserver(ShellObserver* observer) {
-  wm_shell_common_->AddShellObserver(observer);
-}
-
-void WmShellAura::RemoveShellObserver(ShellObserver* observer) {
-  wm_shell_common_->RemoveShellObserver(observer);
-}
-
 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher) {
   Shell::GetInstance()->AddPointerWatcher(watcher);
 }
 
 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) {
   Shell::GetInstance()->RemovePointerWatcher(watcher);
 }
 
 #if defined(OS_CHROMEOS)
 void WmShellAura::ToggleIgnoreExternalKeyboard() {
@@ skipping 24 matching lines @@
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanging());
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
 }  // namespace ash