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

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

Issue 2351893002: mash: Fix system tray clock 12/24 hour time setting (Closed)
Patch Set: review comments 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
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 382007e2c1afa11ce32de04e5c828457e962da67..73f6e2ca8ad566361f8bfa7c081ee5575ac7bb20 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,6 +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/views/select_file_dialog_extension.h"
#include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
#endif
@@ -38,6 +39,10 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
if (chrome::IsRunningInMash()) {
immersive_context_ = base::MakeUnique<ImmersiveContextMus>();
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>();
+#endif
}
#if defined(OS_CHROMEOS)
@@ -68,5 +73,8 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
}
void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
+#if defined(OS_CHROMEOS)
+ system_tray_controller_.reset();
+#endif
chrome::CloseAsh();
}

Powered by Google App Engine
This is Rietveld 408576698