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

Unified Diff: mash/shell/shell_application_delegate.cc

Issue 1645503004: [exp] ash: sysui for mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ash-in-mus
Patch Set: . Created 4 years, 10 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 | « mash/shell/shell_application_delegate.h ('k') | ui/base/user_activity/user_activity_detector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/shell/shell_application_delegate.cc
diff --git a/mash/shell/shell_application_delegate.cc b/mash/shell/shell_application_delegate.cc
index 1cb6e27a63da5102d83932e2d21a5001a1178794..f4948b5710c9616b279616d0f8e37aee95614329 100644
--- a/mash/shell/shell_application_delegate.cc
+++ b/mash/shell/shell_application_delegate.cc
@@ -20,8 +20,12 @@ void ShellApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
app_ = app;
StartBrowserDriver();
StartWindowManager();
+#if 0
StartWallpaper();
StartShelf();
+#else
+ StartSysUI();
+#endif
StartQuickLaunch();
}
@@ -97,6 +101,12 @@ void ShellApplicationDelegate::StartQuickLaunch() {
base::Unretained(this)));
}
+void ShellApplicationDelegate::StartSysUI() {
+ StartRestartableService("mojo:ash_sysui",
+ base::Bind(&ShellApplicationDelegate::StartSysUI,
+ base::Unretained(this)));
+}
+
void ShellApplicationDelegate::StartScreenlock() {
StartRestartableService(
"mojo:screenlock",
« no previous file with comments | « mash/shell/shell_application_delegate.h ('k') | ui/base/user_activity/user_activity_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698