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

Unified Diff: mash/shell/shell_application_delegate.cc

Issue 1641003002: [exp] ash: Ash in Mus. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 11 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/BUILD.gn ('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 30a59191629fb4a35ffbc38b4bea2cb712fd6edc..9da9736fbde77fbae7e0377cbf9afb14b0a38b63 100644
--- a/mash/shell/shell_application_delegate.cc
+++ b/mash/shell/shell_application_delegate.cc
@@ -18,11 +18,16 @@ ShellApplicationDelegate::~ShellApplicationDelegate() {}
void ShellApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
app_ = app;
+#if 0
StartBrowserDriver();
StartWindowManager();
StartWallpaper();
StartShelf();
StartQuickLaunch();
+#else
+ StartBrowserDriver();
+ StartWindowManager();
+#endif
}
bool ShellApplicationDelegate::ConfigureIncomingConnection(
@@ -46,9 +51,8 @@ void ShellApplicationDelegate::Create(
void ShellApplicationDelegate::StartWindowManager() {
StartRestartableService(
- "mojo:desktop_wm",
- base::Bind(&ShellApplicationDelegate::StartWindowManager,
- base::Unretained(this)));
+ "mojo:ash_wm", base::Bind(&ShellApplicationDelegate::StartWindowManager,
+ base::Unretained(this)));
}
void ShellApplicationDelegate::StartWallpaper() {
« no previous file with comments | « mash/shell/BUILD.gn ('k') | ui/base/user_activity/user_activity_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698