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

Side by Side Diff: headless/lib/headless_content_main_delegate.cc

Issue 2867063002: Stability instrumentation Crashpad integration (Closed)
Patch Set: merge Created 3 years, 7 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 | « headless/app/headless_shell.cc ('k') | tools/metrics/histograms/histograms.xml » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "headless/lib/headless_content_main_delegate.h" 5 #include "headless/lib/headless_content_main_delegate.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 } 178 }
179 if (process_type != switches::kZygoteProcess) 179 if (process_type != switches::kZygoteProcess)
180 breakpad::InitCrashReporter(process_type); 180 breakpad::InitCrashReporter(process_type);
181 #elif defined(OS_MACOSX) 181 #elif defined(OS_MACOSX)
182 crash_reporter::InitializeCrashpad(process_type.empty(), process_type); 182 crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
183 // Avoid adding this dependency in Windows Chrome component build, since 183 // Avoid adding this dependency in Windows Chrome component build, since
184 // crashpad is already enabled. 184 // crashpad is already enabled.
185 // TODO(dvallet): Ideally we would also want to avoid this for component build. 185 // TODO(dvallet): Ideally we would also want to avoid this for component build.
186 #elif defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL) 186 #elif defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL)
187 crash_reporter::InitializeCrashpadWithEmbeddedHandler(process_type.empty(), 187 crash_reporter::InitializeCrashpadWithEmbeddedHandler(process_type.empty(),
188 process_type); 188 process_type, "");
189 #endif // defined(HEADLESS_USE_BREAKPAD) 189 #endif // defined(HEADLESS_USE_BREAKPAD)
190 } 190 }
191 191
192 void HeadlessContentMainDelegate::PreSandboxStartup() { 192 void HeadlessContentMainDelegate::PreSandboxStartup() {
193 const base::CommandLine& command_line( 193 const base::CommandLine& command_line(
194 *base::CommandLine::ForCurrentProcess()); 194 *base::CommandLine::ForCurrentProcess());
195 #if defined(OS_WIN) 195 #if defined(OS_WIN)
196 // Windows always needs to initialize logging, otherwise you get a renderer 196 // Windows always needs to initialize logging, otherwise you get a renderer
197 // crash. 197 // crash.
198 InitLogging(command_line); 198 InitLogging(command_line);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 301 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
302 content::ContentRendererClient* 302 content::ContentRendererClient*
303 HeadlessContentMainDelegate::CreateContentRendererClient() { 303 HeadlessContentMainDelegate::CreateContentRendererClient() {
304 renderer_client_ = base::MakeUnique<HeadlessContentRendererClient>(); 304 renderer_client_ = base::MakeUnique<HeadlessContentRendererClient>();
305 return renderer_client_.get(); 305 return renderer_client_.get();
306 } 306 }
307 #endif // !defined(CHROME_MULTIPLE_DLL_BROWSER) 307 #endif // !defined(CHROME_MULTIPLE_DLL_BROWSER)
308 308
309 } // namespace headless 309 } // namespace headless
OLDNEW
« no previous file with comments | « headless/app/headless_shell.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698