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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/app/mash/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/app/chrome_main_delegate.h" 10 #include "chrome/app/chrome_main_delegate.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 SetUpBundleOverrides(); 103 SetUpBundleOverrides();
104 #endif 104 #endif
105 return headless::HeadlessShellMain(argc, argv); 105 return headless::HeadlessShellMain(argc, argv);
106 } 106 }
107 #endif // defined(OS_LINUX) || defined(OS_MACOSX) 107 #endif // defined(OS_LINUX) || defined(OS_MACOSX)
108 108
109 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) 109 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
110 version_info::Channel channel = chrome::GetChannel(); 110 version_info::Channel channel = chrome::GetChannel();
111 if (channel == version_info::Channel::CANARY || 111 if (channel == version_info::Channel::CANARY ||
112 channel == version_info::Channel::UNKNOWN) { 112 channel == version_info::Channel::UNKNOWN) {
113 if (command_line->HasSwitch(switches::kMash)) 113 if (command_line->HasSwitch(switches::kMash) ||
114 command_line->HasSwitch(switches::kMus)) {
114 return MashMain(); 115 return MashMain();
116 }
115 WaitForMashDebuggerIfNecessary(); 117 WaitForMashDebuggerIfNecessary();
116 if (service_manager::ServiceManagerIsRemote()) 118 if (service_manager::ServiceManagerIsRemote())
117 params.env_mode = aura::Env::Mode::MUS; 119 params.env_mode = aura::Env::Mode::MUS;
118 } 120 }
119 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) 121 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
120 122
121 int rv = content::ContentMain(params); 123 int rv = content::ContentMain(params);
122 124
123 #if defined(OS_WIN) 125 #if defined(OS_WIN)
124 base::win::SetShouldCrashOnProcessDetach(false); 126 base::win::SetShouldCrashOnProcessDetach(false);
125 #endif 127 #endif
126 128
127 return rv; 129 return rv;
128 } 130 }
OLDNEW
« 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