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

Unified Diff: ash/common/wm_shell.h

Issue 2545723003: ash: Add SessionController/Client mojo interfaces (Closed)
Patch Set: rebase, use ash_util::GetAshServiceName Created 4 years 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/session/session_state_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 65ad4a224964c49766a098168225dafb75667b19..9eff74dcbe70f1bcd8eecb3a6fdff206df46424f 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -57,6 +57,7 @@ class MruWindowTracker;
class NewWindowController;
class PaletteDelegate;
class ScopedDisableInternalMouseAndKeyboard;
+class SessionController;
class SessionStateDelegate;
class ShelfController;
class ShelfDelegate;
@@ -153,6 +154,8 @@ class ASH_EXPORT WmShell {
PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
+ SessionController* session_controller() { return session_controller_.get(); }
+
ShelfController* shelf_controller() { return shelf_controller_.get(); }
ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
@@ -491,6 +494,7 @@ class ASH_EXPORT WmShell {
std::unique_ptr<MruWindowTracker> mru_window_tracker_;
std::unique_ptr<NewWindowController> new_window_controller_;
std::unique_ptr<PaletteDelegate> palette_delegate_;
+ std::unique_ptr<SessionController> session_controller_;
std::unique_ptr<ShelfController> shelf_controller_;
std::unique_ptr<ShelfDelegate> shelf_delegate_;
std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
« no previous file with comments | « ash/common/session/session_state_delegate.h ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698