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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 2627713007: Move v8_breakpad_support_win from common to child (Closed)
Patch Set: . Created 3 years, 11 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 | « no previous file | chrome/child/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 31663ece1a3944cd711513edfba9bedf3d8c9b75..5f8dea5917de3846cccec9c86598bc1b1b695f6d 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -64,8 +64,8 @@
#include <algorithm>
#include "base/debug/close_handle_hook_win.h"
#include "chrome/browser/downgrade/user_data_downgrade.h"
+#include "chrome/child/v8_breakpad_support_win.h"
#include "chrome/common/child_process_logging.h"
-#include "chrome/common/v8_breakpad_support_win.h"
#include "components/crash/content/app/crashpad.h"
#include "sandbox/win/src/sandbox.h"
#include "ui/base/resource/resource_bundle_win.h"
@@ -533,7 +533,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
base::Bind(&IsTraceEventArgsWhitelisted));
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL_BROWSER)
v8_breakpad_support::SetUp();
#endif
« no previous file with comments | « no previous file | chrome/child/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698