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

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.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
Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index df8db2b5ab7d4c3107d066340ee589eef182f542..32de683c1d01e9f44c492e252d2338bd29d7301c 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -25,6 +25,7 @@
#include "ui/keyboard/keyboard_controller.h"
#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/session_controller_client.h"
#include "chrome/browser/ui/ash/system_tray_client.h"
#include "chrome/browser/ui/ash/vpn_list_forwarder.h"
#include "chrome/browser/ui/views/select_file_dialog_extension.h"
@@ -45,6 +46,10 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
}
#if defined(OS_CHROMEOS)
+ // TODO(xiyuan): Update after SesssionStateDelegate is deprecated.
+ if (chrome::IsRunningInMash())
+ session_controller_client_ = base::MakeUnique<SessionControllerClient>();
+
// Must be available at login screen, so initialize before profile.
system_tray_client_ = base::MakeUnique<SystemTrayClient>();
@@ -87,6 +92,7 @@ void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
vpn_list_forwarder_.reset();
system_tray_client_.reset();
cast_config_client_media_router_.reset();
+ session_controller_client_.reset();
#endif
chrome::CloseAsh();
}

Powered by Google App Engine
This is Rietveld 408576698