Commit 66c78e9b authored by scottmg's avatar scottmg Committed by Commit bot

Move v8_breakpad_support_win from common to child

Part of removing dependency of Windows browser DLL on v8.

R=jochen@chromium.org
BUG=581766

Review-Url: https://codereview.chromium.org/2627713007
Cr-Commit-Position: refs/heads/master@{#443244}
parent bba0e669
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
#include <algorithm> #include <algorithm>
#include "base/debug/close_handle_hook_win.h" #include "base/debug/close_handle_hook_win.h"
#include "chrome/browser/downgrade/user_data_downgrade.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/child_process_logging.h"
#include "chrome/common/v8_breakpad_support_win.h"
#include "components/crash/content/app/crashpad.h" #include "components/crash/content/app/crashpad.h"
#include "sandbox/win/src/sandbox.h" #include "sandbox/win/src/sandbox.h"
#include "ui/base/resource/resource_bundle_win.h" #include "ui/base/resource/resource_bundle_win.h"
...@@ -533,7 +533,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) { ...@@ -533,7 +533,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate( base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
base::Bind(&IsTraceEventArgsWhitelisted)); base::Bind(&IsTraceEventArgsWhitelisted));
#if defined(OS_WIN) #if defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL_BROWSER)
v8_breakpad_support::SetUp(); v8_breakpad_support::SetUp();
#endif #endif
......
...@@ -6,6 +6,8 @@ static_library("child") { ...@@ -6,6 +6,8 @@ static_library("child") {
sources = [ sources = [
"pdf_child_init.cc", "pdf_child_init.cc",
"pdf_child_init.h", "pdf_child_init.h",
"v8_breakpad_support_win.cc",
"v8_breakpad_support_win.h",
] ]
configs += [ "//build/config/compiler:wexit_time_destructors" ] configs += [ "//build/config/compiler:wexit_time_destructors" ]
...@@ -13,5 +15,6 @@ static_library("child") { ...@@ -13,5 +15,6 @@ static_library("child") {
deps = [ deps = [
"//base", "//base",
"//content/public/child", "//content/public/child",
"//gin",
] ]
} }
include_rules = [ include_rules = [
"+content/public/child", "+content/public/child",
"+gin",
] ]
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/common/v8_breakpad_support_win.h" #include "chrome/child/v8_breakpad_support_win.h"
#include <windows.h> #include <windows.h>
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_COMMON_V8_BREAKPAD_SUPPORT_WIN_H_ #ifndef CHROME_CHILD_V8_BREAKPAD_SUPPORT_WIN_H_
#define CHROME_COMMON_V8_BREAKPAD_SUPPORT_WIN_H_ #define CHROME_CHILD_V8_BREAKPAD_SUPPORT_WIN_H_
namespace v8_breakpad_support { namespace v8_breakpad_support {
...@@ -12,4 +12,4 @@ void SetUp(); ...@@ -12,4 +12,4 @@ void SetUp();
} // namespace v8_breakpad_support } // namespace v8_breakpad_support
#endif // CHROME_COMMON_V8_BREAKPAD_SUPPORT_WIN_H_ #endif // CHROME_CHILD_V8_BREAKPAD_SUPPORT_WIN_H_
...@@ -150,8 +150,6 @@ static_library("common") { ...@@ -150,8 +150,6 @@ static_library("common") {
"tts_utterance_request.h", "tts_utterance_request.h",
"url_constants.cc", "url_constants.cc",
"url_constants.h", "url_constants.h",
"v8_breakpad_support_win.cc",
"v8_breakpad_support_win.h",
"web_application_info.cc", "web_application_info.cc",
"web_application_info.h", "web_application_info.h",
"widevine_cdm_constants.cc", "widevine_cdm_constants.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment