diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-09 16:28:48 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-09 16:28:48 +0000 |
| commit | 8dc338cc06b9eea59bea49ab3c8622f3ccc12ad5 (patch) | |
| tree | c380671d248e00f2d03d27cf5b964d03d2bf8f55 /chrome/nacl | |
| parent | 966d961e275a77a819da8fc0f8cd1b25906f7eaa (diff) | |
| download | chromium_src-8dc338cc06b9eea59bea49ab3c8622f3ccc12ad5.zip chromium_src-8dc338cc06b9eea59bea49ab3c8622f3ccc12ad5.tar.gz chromium_src-8dc338cc06b9eea59bea49ab3c8622f3ccc12ad5.tar.bz2 | |
Revert 239219 - "Revert of https://codereview.chromium.org/104593008/"
> [breakpad] remove dependency on content_switches.cc
>
> https://codereview.chromium.org/104593008/
R=noms@chromium.org
TBR=joi@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/110113002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/DEPS | 1 | ||||
| -rw-r--r-- | chrome/nacl/nacl_exe_win_64.cc | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/nacl/DEPS b/chrome/nacl/DEPS index 62f4687..fc2577b 100644 --- a/chrome/nacl/DEPS +++ b/chrome/nacl/DEPS @@ -4,5 +4,6 @@ include_rules = [ "+components/breakpad", "+components/nacl", "+content/public/app/startup_helper_win.h", + "+content/public/common/content_switches.h", "+sandbox/win/src", ] diff --git a/chrome/nacl/nacl_exe_win_64.cc b/chrome/nacl/nacl_exe_win_64.cc index 0b534b4..a0d5351 100644 --- a/chrome/nacl/nacl_exe_win_64.cc +++ b/chrome/nacl/nacl_exe_win_64.cc @@ -8,6 +8,7 @@ #include "chrome/app/chrome_breakpad_client.h" #include "components/breakpad/app/breakpad_win.h" #include "components/nacl/loader/nacl_helper_win_64.h" +#include "content/public/common/content_switches.h" namespace { @@ -20,8 +21,11 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { base::AtExitManager exit_manager; CommandLine::Init(0, NULL); + std::string process_type = + CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kProcessType); breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); - breakpad::InitCrashReporter(); + breakpad::InitCrashReporter(process_type); return nacl::NaClWin64Main(); } |