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

Side by Side Diff: chrome/app/chrome_main.cc

Issue 2762593002: Add --headless flag to Windows (Closed)
Patch Set: Fix Mac build 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
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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 #if defined(OS_LINUX) || defined(OS_MACOSX) 100 #if defined(OS_LINUX) || defined(OS_MACOSX)
101 if (command_line->HasSwitch(switches::kHeadless)) { 101 if (command_line->HasSwitch(switches::kHeadless)) {
102 #if defined(OS_MACOSX) 102 #if defined(OS_MACOSX)
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_WIN)
110 base::CommandLine::Init(0, NULL);
111 if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) {
112 return headless::HeadlessShellMain(instance, sandbox_info);
113 }
114 #endif // defined(OS_WIN)
115
109 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) 116 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
110 version_info::Channel channel = chrome::GetChannel(); 117 version_info::Channel channel = chrome::GetChannel();
111 if (channel == version_info::Channel::CANARY || 118 if (channel == version_info::Channel::CANARY ||
112 channel == version_info::Channel::UNKNOWN) { 119 channel == version_info::Channel::UNKNOWN) {
113 if (command_line->HasSwitch(switches::kMash)) 120 if (command_line->HasSwitch(switches::kMash))
114 return MashMain(); 121 return MashMain();
115 WaitForMashDebuggerIfNecessary(); 122 WaitForMashDebuggerIfNecessary();
116 if (service_manager::ServiceManagerIsRemote()) 123 if (service_manager::ServiceManagerIsRemote())
117 params.env_mode = aura::Env::Mode::MUS; 124 params.env_mode = aura::Env::Mode::MUS;
118 } 125 }
119 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) 126 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
120 127
121 int rv = content::ContentMain(params); 128 int rv = content::ContentMain(params);
122 129
123 #if defined(OS_WIN) 130 #if defined(OS_WIN)
124 base::win::SetShouldCrashOnProcessDetach(false); 131 base::win::SetShouldCrashOnProcessDetach(false);
125 #endif 132 #endif
126 133
127 return rv; 134 return rv;
128 } 135 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698