Folds methods in WmShellCommon to WmShell

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 "ash/common/default_accessibility_delegate.h"
 #include "ash/common/display/display_info.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm_activation_observer.h"
-#include "ash/common/wm_shell_common.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/root_window_controller.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "components/user_manager/user_info_impl.h"
@@ skipping 62 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
 WmShellMus::WmShellMus(::mus::WindowTreeClient* client)
     : client_(client), session_state_delegate_(new SessionStateDelegateStub) {
   client_->AddObserver(this);
   WmShell::Set(this);
 
-  wm_shell_common_.reset(new WmShellCommon);
-  wm_shell_common_->CreateMruWindowTracker();
+  CreateMruWindowTracker();
 
   accessibility_delegate_.reset(new DefaultAccessibilityDelegate);
   SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
 }
 
 WmShellMus::~WmShellMus() {
   DeleteSystemTrayDelegate();
   DeleteWindowSelectorController();
-  wm_shell_common_->DeleteMruWindowTracker();
+  DeleteMruWindowTracker();
   RemoveClientObserver();
   WmShell::Set(nullptr);
 }
 
 // static
 WmShellMus* WmShellMus::Get() {
   return static_cast<WmShellMus*>(WmShell::Get());
 }
 
 void WmShellMus::AddRootWindowController(
@@ skipping 23 matching lines @@
     int64_t id) {
   for (WmRootWindowControllerMus* root_window_controller :
        root_window_controllers_) {
     if (root_window_controller->GetDisplay().id() == id)
       return root_window_controller;
   }
   NOTREACHED();
   return nullptr;
 }
 
-MruWindowTracker* WmShellMus::GetMruWindowTracker() {
-  return wm_shell_common_->mru_window_tracker();
-}
-
 WmWindow* WmShellMus::NewContainerWindow() {
   return WmWindowMus::Get(client_->NewWindow());
 }
 
 WmWindow* WmShellMus::GetFocusedWindow() {
   return WmWindowMus::Get(client_->GetFocusedWindow());
 }
 
 WmWindow* WmShellMus::GetActiveWindow() {
   return GetToplevelAncestor(client_->GetFocusedWindow());
@@ skipping 65 matching lines @@
 
 std::unique_ptr<wm::MaximizeModeEventHandler>
 WmShellMus::CreateMaximizeModeEventHandler() {
   // TODO: need support for window manager to get events before client:
   // http://crbug.com/624157.
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 void WmShellMus::OnOverviewModeStarting() {
-  FOR_EACH_OBSERVER(ShellObserver, *wm_shell_common_->shell_observers(),
+  FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
                     OnOverviewModeStarting());
 }
 
 void WmShellMus::OnOverviewModeEnded() {
-  FOR_EACH_OBSERVER(ShellObserver, *wm_shell_common_->shell_observers(),
-                    OnOverviewModeEnded());
+  FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
 }
 
 AccessibilityDelegate* WmShellMus::GetAccessibilityDelegate() {
   return accessibility_delegate_.get();
 }
 
 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() {
   return session_state_delegate_.get();
 }
 
 void WmShellMus::AddActivationObserver(WmActivationObserver* observer) {
   activation_observers_.AddObserver(observer);
 }
 
 void WmShellMus::RemoveActivationObserver(WmActivationObserver* observer) {
   activation_observers_.RemoveObserver(observer);
 }
 
 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) {
   NOTIMPLEMENTED();
 }
 
-void WmShellMus::AddShellObserver(ShellObserver* observer) {
-  wm_shell_common_->AddShellObserver(observer);
-}
-
-void WmShellMus::RemoveShellObserver(ShellObserver* observer) {
-  wm_shell_common_->RemoveShellObserver(observer);
-}
-
 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) {
   // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here.
   NOTIMPLEMENTED();
 }
 
 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
   NOTIMPLEMENTED();
 }
 
 #if defined(OS_CHROMEOS)
@@ skipping 28 matching lines @@
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) {
   DCHECK_EQ(client, client_);
   RemoveClientObserver();
 }
 
 }  // namespace mus
 }  // namespace ash