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

Unified Diff: ash/common/wm_shell.h

Issue 2192613002: Moves NewWindowDelegate to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order 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/new_window_delegate.h ('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 1cdc2c5b913deccffd8585d6848ab07de66eda46..6639304e23454053ac30dcdda00469096dde0e8c 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -31,6 +31,7 @@ class KeyboardBrightnessControlDelegate;
class KeyboardUI;
class MaximizeModeController;
class MruWindowTracker;
+class NewWindowDelegate;
class ScopedDisableInternalMouseAndKeyboard;
class SessionStateDelegate;
class ShelfDelegate;
@@ -101,6 +102,10 @@ class ASH_EXPORT WmShell {
MediaDelegate* media_delegate() { return media_delegate_.get(); }
+ NewWindowDelegate* new_window_delegate() {
+ return new_window_delegate_.get();
+ }
+
ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
ShelfModel* shelf_model() { return shelf_model_.get(); }
@@ -323,6 +328,7 @@ class ASH_EXPORT WmShell {
std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
std::unique_ptr<MediaDelegate> media_delegate_;
std::unique_ptr<MruWindowTracker> mru_window_tracker_;
+ std::unique_ptr<NewWindowDelegate> new_window_delegate_;
std::unique_ptr<ShelfDelegate> shelf_delegate_;
std::unique_ptr<ShelfModel> shelf_model_;
std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
« no previous file with comments | « ash/common/new_window_delegate.h ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698