Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1203)

Unified Diff: ash/shell.h

Issue 2041423002: Moves MruWindowTracker to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mru_window_tracker
Patch Set: comment Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 8d4358d86ee83a8eab746698e60e966e2875ba48..d3a0113f08e42b40cf220df0069b396c7421d3b5 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -11,6 +11,7 @@
#include "ash/ash_export.h"
#include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shell_common.h"
#include "ash/metrics/user_metrics_recorder.h"
#include "ash/system/user/login_status.h"
#include "ash/wm/cursor_manager_chromeos.h"
@@ -139,6 +140,7 @@ class ShelfDelegate;
class ShelfItemDelegateManager;
class ShelfModel;
class ShelfWindowWatcher;
+class ShellCommon;
class ShellDelegate;
struct ShellInitParams;
class ShellObserver;
@@ -386,7 +388,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return lock_state_controller_.get();
}
MruWindowTracker* mru_window_tracker() {
- return mru_window_tracker_.get();
+ return shell_common_->mru_window_tracker();
}
VideoDetector* video_detector() {
return video_detector_.get();
@@ -658,6 +660,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
scoped_overview_animation_settings_factory_;
+ std::unique_ptr<ShellCommon> shell_common_;
std::unique_ptr<WmShellAura> wm_shell_;
// When no explicit target display/RootWindow is given, new windows are
@@ -701,7 +704,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_;
« ash/common/shell_common.h ('K') | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698