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

Unified Diff: ash/common/wm_shell.h

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order 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
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.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 9b9c2dd854ed2552c9586da241bf3f5b5ec28f52..aa97f46c168a1f37db49c675379de39488dc8590 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -29,6 +29,7 @@ class AccessibilityDelegate;
class DisplayInfo;
class FocusCycler;
class KeyboardUI;
+class MaximizeModeController;
class MruWindowTracker;
class ScopedDisableInternalMouseAndKeyboard;
class SessionStateDelegate;
@@ -64,6 +65,10 @@ class ASH_EXPORT WmShell {
KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
+ MaximizeModeController* maximize_mode_controller() {
+ return maximize_mode_controller_.get();
+ }
+
MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
MediaDelegate* media_delegate() { return media_delegate_.get(); }
@@ -219,6 +224,9 @@ class ASH_EXPORT WmShell {
void DeleteWindowSelectorController();
+ void CreateMaximizeModeController();
+ void DeleteMaximizeModeController();
+
void CreateMruWindowTracker();
void DeleteMruWindowTracker();
@@ -231,6 +239,7 @@ class ASH_EXPORT WmShell {
std::unique_ptr<FocusCycler> focus_cycler_;
std::unique_ptr<KeyboardUI> keyboard_ui_;
+ std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
std::unique_ptr<MediaDelegate> media_delegate_;
std::unique_ptr<MruWindowTracker> mru_window_tracker_;
std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698