Moves MruWindowTracker to WmShell

ash/shell.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_types.h"
+#include "ash/common/wm_shell_common.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/cursor_manager_chromeos.h"
 #include "ash/wm/system_modal_container_event_filter_delegate.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/window.h"
@@ skipping 355 matching lines @@
       LinkHandlerModelFactory* link_handler_model_factory) {
     link_handler_model_factory_ = link_handler_model_factory;
   }
   PowerButtonController* power_button_controller() {
     return power_button_controller_.get();
   }
   LockStateController* lock_state_controller() {
     return lock_state_controller_.get();
   }
   MruWindowTracker* mru_window_tracker() {
-    return mru_window_tracker_.get();
+    return wm_shell_common_->mru_window_tracker();
   }
   VideoDetector* video_detector() {
     return video_detector_.get();
   }
   WindowCycleController* window_cycle_controller() {
     return window_cycle_controller_.get();
   }
   WindowSelectorController* window_selector_controller() {
     return window_selector_controller_.get();
   }
@@ skipping 251 matching lines @@
       aura::Window* lost_active) override;
 
   static Shell* instance_;
 
   // If set before the Shell is initialized, the mouse cursor will be hidden
   // when the screen is initially created.
   static bool initially_hide_cursor_;
 
   std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
       scoped_overview_animation_settings_factory_;
+  std::unique_ptr<WmShellCommon> wm_shell_common_;
   std::unique_ptr<WmShellAura> wm_shell_;
 
   // When no explicit target display/RootWindow is given, new windows are
   // created on |scoped_target_root_window_| , unless NULL in
   // which case they are created on |target_root_window_|.
   // |target_root_window_| never becomes NULL during the session.
   aura::Window* target_root_window_;
   aura::Window* scoped_target_root_window_;
 
   // The CompoundEventFilter owned by aura::Env object.
@@ skipping 23 matching lines @@
   std::unique_ptr<DragDropController> drag_drop_controller_;
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
   std::unique_ptr<::wm::ShadowController> shadow_controller_;
   std::unique_ptr<::wm::VisibilityController> visibility_controller_;
   std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
   std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
   std::unique_ptr<DesktopBackgroundController> desktop_background_controller_;
   LinkHandlerModelFactory* link_handler_model_factory_;
   std::unique_ptr<PowerButtonController> power_button_controller_;
   std::unique_ptr<LockStateController> lock_state_controller_;
-  std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
   std::unique_ptr<VideoDetector> video_detector_;
   std::unique_ptr<WindowCycleController> window_cycle_controller_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
   std::unique_ptr<HighContrastController> high_contrast_controller_;
   std::unique_ptr<MagnificationController> magnification_controller_;
   std::unique_ptr<PartialMagnificationController>
       partial_magnification_controller_;
@@ skipping 90 matching lines @@
   bool in_mus_ = false;
 
   std::unique_ptr<KeyboardUI> keyboard_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_