diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-02 17:22:30 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-02 17:22:30 +0000 |
commit | b80f6843f26b8b48672b104a5cac38be0b1f5bc1 (patch) | |
tree | 98a4248a1a217d209858ba2357c6e9607248e954 /content/browser/browser_child_process_host.cc | |
parent | 2ec3d508d2fd7b33763b2ae22afd2804e6b881a0 (diff) | |
download | chromium_src-b80f6843f26b8b48672b104a5cac38be0b1f5bc1.zip chromium_src-b80f6843f26b8b48672b104a5cac38be0b1f5bc1.tar.gz chromium_src-b80f6843f26b8b48672b104a5cac38be0b1f5bc1.tar.bz2 |
Remove safe_browsing code from BrowserRenderProcessHost. Also remove crash reporting glue in content.
BUG=77089,77093
Review URL: http://codereview.chromium.org/6901137
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_child_process_host.cc')
-rw-r--r-- | content/browser/browser_child_process_host.cc | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc index e6375f0..c5528d6 100644 --- a/content/browser/browser_child_process_host.cc +++ b/content/browser/browser_child_process_host.cc @@ -13,12 +13,10 @@ #include "base/process_util.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "chrome/app/breakpad_mac.h" -#include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" #include "content/browser/browser_thread.h" +#include "content/browser/content_browser_client.h" #include "content/browser/renderer_host/resource_message_filter.h" #include "content/browser/trace_message_filter.h" #include "content/common/notification_service.h" @@ -26,10 +24,6 @@ #include "content/common/process_watcher.h" #include "content/common/result_codes.h" -#if defined(OS_LINUX) -#include "base/linux_util.h" -#endif // OS_LINUX - namespace { typedef std::list<BrowserChildProcessHost*> ChildProcessList; @@ -72,22 +66,6 @@ BrowserChildProcessHost::~BrowserChildProcessHost() { } // static -void BrowserChildProcessHost::SetCrashReporterCommandLine( - CommandLine* command_line) { -#if defined(USE_LINUX_BREAKPAD) - if (IsCrashReporterEnabled()) { - command_line->AppendSwitchASCII(switches::kEnableCrashReporter, - child_process_logging::GetClientId() + "," + base::GetLinuxDistro()); - } -#elif defined(OS_MACOSX) - if (IsCrashReporterEnabled()) { - command_line->AppendSwitchASCII(switches::kEnableCrashReporter, - child_process_logging::GetClientId()); - } -#endif // OS_MACOSX -} - -// static void BrowserChildProcessHost::TerminateAll() { // Make a copy since the ChildProcessHost dtor mutates the original list. ChildProcessList copy = g_child_process_list.Get(); @@ -102,6 +80,10 @@ void BrowserChildProcessHost::Launch( const base::environment_vector& environ, #endif CommandLine* cmd_line) { + + content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( + cmd_line, id()); + child_process_.reset(new ChildProcessLauncher( #if defined(OS_WIN) exposed_dir, |