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

Unified Diff: chrome/app/chrome_main.cc

Issue 2775873002: Adds the ability to run chromeos with mus (Closed)
Patch Set: merge Created 3 years, 9 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/app/BUILD.gn ('k') | chrome/app/mash/BUILD.gn » ('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 c5177ec1e5a4435d21c03a506a339ef8eb6004a0..2cc37702d9cd2f141e9a5a37cc81dc078c288f66 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -110,8 +110,10 @@ int ChromeMain(int argc, const char** argv) {
version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::CANARY ||
channel == version_info::Channel::UNKNOWN) {
- if (command_line->HasSwitch(switches::kMash))
+ if (command_line->HasSwitch(switches::kMash) ||
+ command_line->HasSwitch(switches::kMus)) {
return MashMain();
+ }
WaitForMashDebuggerIfNecessary();
if (service_manager::ServiceManagerIsRemote())
params.env_mode = aura::Env::Mode::MUS;
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/app/mash/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698