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

Unified Diff: ash/common/wm_shell.h

Issue 2157393002: Moves WindowCycleList/Controller to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback and std::move Created 4 years, 5 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
« no previous file with comments | « ash/common/wm/window_cycle_list.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 2947fbfea2ae82e95db6f570ea3a6c3f72f42f2c..3ae326554ffedc20e7cbc51e393428051bd4781a 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -35,6 +35,7 @@ class ShellDelegate;
class ShellObserver;
class SystemTrayDelegate;
class SystemTrayNotifier;
+class WindowCycleController;
class WindowCycleEventFilter;
class WindowResizer;
class WindowSelectorController;
@@ -99,6 +100,10 @@ class ASH_EXPORT WmShell {
return system_tray_delegate_.get();
}
+ WindowCycleController* window_cycle_controller() {
+ return window_cycle_controller_.get();
+ }
+
WindowSelectorController* window_selector_controller() {
return window_selector_controller_.get();
}
@@ -244,6 +249,8 @@ class ASH_EXPORT WmShell {
void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
void DeleteSystemTrayDelegate();
+ void DeleteWindowCycleController();
+
void DeleteWindowSelectorController();
void CreateMaximizeModeController();
@@ -272,6 +279,7 @@ class ASH_EXPORT WmShell {
std::unique_ptr<MruWindowTracker> mru_window_tracker_;
std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
+ std::unique_ptr<WindowCycleController> window_cycle_controller_;
std::unique_ptr<WindowSelectorController> window_selector_controller_;
bool simulate_modal_window_open_for_testing_ = false;
« no previous file with comments | « ash/common/wm/window_cycle_list.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698