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

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 2360143004: mash: Add SystemTrayClient interface, use to show date settings (Closed)
Patch Set: reparent Created 4 years, 3 months 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 | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 73f6e2ca8ad566361f8bfa7c081ee5575ac7bb20..704550cb08997c82340569bfa73356b48ccc3a21 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
@@ -23,7 +23,7 @@
#include "ui/keyboard/keyboard_controller.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/ui/ash/system_tray_controller_mus.h"
+#include "chrome/browser/ui/ash/system_tray_client.h"
#include "chrome/browser/ui/views/select_file_dialog_extension.h"
#include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
#endif
@@ -41,7 +41,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
#if defined(OS_CHROMEOS)
// Must be available at login screen, so initialize before profile.
- system_tray_controller_ = base::MakeUnique<SystemTrayControllerMus>();
+ system_tray_client_ = base::MakeUnique<SystemTrayClient>();
#endif
}
@@ -74,7 +74,7 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
#if defined(OS_CHROMEOS)
- system_tray_controller_.reset();
+ system_tray_client_.reset();
#endif
chrome::CloseAsh();
}
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698