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

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, 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
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 bcfe14fd5e392dd406e56cea2905f76bddcab09a..e75bc9683b98964b3a396cc2ffc314db1984b3cb 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
@@ -26,6 +26,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/volume_controller.h"
#include "chrome/browser/ui/ash/vpn_list_forwarder.h"
@@ -47,6 +48,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>();
new_window_client_ = base::MakeUnique<ChromeNewWindowClient>();
@@ -92,6 +97,7 @@ void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
new_window_client_.reset();
system_tray_client_.reset();
cast_config_client_media_router_.reset();
+ session_controller_client_.reset();
#endif
chrome::CloseAsh();
}
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h ('k') | components/session_manager/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698