| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index f0754e412806a1d08029831d2abe04c064256e18..3a22fd04f330a93b53a5877e26c5d716d934fe9b 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -10,6 +10,7 @@
|
| #include <vector>
|
|
|
| #include "ash/ash_export.h"
|
| +#include "ash/aura/wm_shell_aura.h"
|
| #include "ash/common/shelf/shelf_types.h"
|
| #include "ash/metrics/user_metrics_recorder.h"
|
| #include "ash/system/user/login_status.h"
|
| @@ -386,7 +387,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| return lock_state_controller_.get();
|
| }
|
| MruWindowTracker* mru_window_tracker() {
|
| - return mru_window_tracker_.get();
|
| + return wm_shell_->mru_window_tracker();
|
| }
|
| VideoDetector* video_detector() {
|
| return video_detector_.get();
|
| @@ -701,7 +702,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| 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_;
|
|
|