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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/wm_shell.cc

Issue 2545723003: ash: Add SessionController/Client mojo interfaces (Closed)
Patch Set: rebase 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
« ash/common/session/session_controller_unittest.cc ('K') | « ash/common/wm_shell.h ('k') | ash/mus/manifest.json » ('j') | ash/public/interfaces/session_controller.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 0ef8c86b88330f965d3ad0dc1a03741e9ace4c68..2234f98854f556ad1d54a8a0a68826ece8254f80 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -16,6 +16,7 @@
#include "ash/common/keyboard/keyboard_ui.h"
#include "ash/common/new_window_client_proxy.h"
#include "ash/common/palette_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/app_list_shelf_item_delegate.h"
#include "ash/common/shelf/shelf_controller.h"
@@ -255,6 +256,7 @@ WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
base::MakeUnique<LocaleNotificationController>()),
new_window_client_(base::MakeUnique<NewWindowClientProxy>(
delegate_->GetShellConnector())),
+ session_controller_(base::MakeUnique<SessionController>()),
shelf_controller_(base::MakeUnique<ShelfController>()),
shutdown_controller_(base::MakeUnique<ShutdownController>()),
system_tray_controller_(base::MakeUnique<SystemTrayController>()),
« ash/common/session/session_controller_unittest.cc ('K') | « ash/common/wm_shell.h ('k') | ash/mus/manifest.json » ('j') | ash/public/interfaces/session_controller.mojom » ('J')

Powered by Google App Engine
This is Rietveld 408576698