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

Unified Diff: chrome/app/chrome_main.cc

Issue 2577963006: Revert of Converts chrome to aura-mus (Closed)
Patch Set: 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
« no previous file with comments | « chrome/app/DEPS ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 5d63c3b6f639ebb203b0ec376825c5577f6ffe73..8e1dcc577a1b9bba422497d3618a3fd91333c4ca 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -18,7 +18,6 @@
#include "chrome/app/mash/mash_runner.h"
#include "chrome/common/channel_info.h"
#include "components/version_info/version_info.h"
-#include "services/service_manager/runner/common/client_util.h"
#endif
#if defined(OS_WIN)
@@ -104,8 +103,6 @@
if (command_line->HasSwitch("mash"))
return MashMain();
WaitForMashDebuggerIfNecessary();
- if (service_manager::ServiceManagerIsRemote())
- params.env_mode = aura::Env::Mode::MUS;
}
#endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
« no previous file with comments | « chrome/app/DEPS ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698