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

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: use a default to fix null avatar image failures 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 a8579f5732e0adf4cece66fc93760e89c74205dc..f1860fe8dd8812feb33364d307826186bdf3cd14 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
@@ -24,6 +24,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"
@@ -46,6 +47,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
#if defined(OS_CHROMEOS)
// Must be available at login screen, so initialize before profile.
system_tray_client_ = base::MakeUnique<SystemTrayClient>();
+ session_controller_client_ = base::MakeUnique<SessionControllerClient>();
James Cook 2016/12/01 23:01:44 Do you want to create this only when IsRunningInMa
xiyuan 2016/12/06 00:46:34 Put this under IsRunningInMash() since it is not u
vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>();
@@ -82,6 +84,7 @@ void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
#if defined(OS_CHROMEOS)
vpn_list_forwarder_.reset();
system_tray_client_.reset();
+ session_controller_client_.reset();
James Cook 2016/12/01 23:01:44 nit: either initialize before system_tray_client o
xiyuan 2016/12/06 00:46:34 Done.
#endif
chrome::CloseAsh();
}

Powered by Google App Engine
This is Rietveld 408576698