diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 17:59:12 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 17:59:12 +0000 |
commit | 2ff8afa71ab7098f8ab2d72a33cd9a21a6c7a4e1 (patch) | |
tree | 5ad2ab3630f8846d2d6be6a8f5bb9d727bd68cf1 /chrome/app | |
parent | 017fceb506133fe742c581da61fba83e0b82bf71 (diff) | |
download | chromium_src-2ff8afa71ab7098f8ab2d72a33cd9a21a6c7a4e1.zip chromium_src-2ff8afa71ab7098f8ab2d72a33cd9a21a6c7a4e1.tar.gz chromium_src-2ff8afa71ab7098f8ab2d72a33cd9a21a6c7a4e1.tar.bz2 |
Fix Mac Breakpad glue compilation error:
breakpad_mac.mm:137: error: 'parsed_command_line' was not declared in this scope
since r31143
BUG=none
TEST=Breakpad-enabled build should, um, build
Review URL: http://codereview.chromium.org/374011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/breakpad_mac.mm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm index f66093b..56f24ee 100644 --- a/chrome/app/breakpad_mac.mm +++ b/chrome/app/breakpad_mac.mm @@ -48,14 +48,13 @@ void InitCrashReporter() { // process, so the browser passes the consent preference to them on the // command line. NSBundle* main_bundle = mac_util::MainAppBundle(); - NSDictionary* info_dictionary = [main_bundle infoDictionary]; bool is_browser = !mac_util::IsBackgroundOnlyProcess(); + CommandLine* command_line = CommandLine::ForCurrentProcess(); bool enable_breakpad = is_browser ? GoogleUpdateSettings::GetCollectStatsConsent() : - CommandLine::ForCurrentProcess()-> - HasSwitch(switches::kEnableCrashReporter); + command_line->HasSwitch(switches::kEnableCrashReporter); - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableBreakpad)) { + if (command_line->HasSwitch(switches::kDisableBreakpad)) { enable_breakpad = false; } @@ -73,6 +72,7 @@ void InitCrashReporter() { NSString *reporter_location = [[NSBundle bundleWithPath:reporter_bundle_location] executablePath]; + NSDictionary* info_dictionary = [main_bundle infoDictionary]; NSMutableDictionary *breakpad_config = [[info_dictionary mutableCopy] autorelease]; [breakpad_config setObject:inspector_location @@ -131,10 +131,11 @@ void InitCrashReporter() { // TODO: Should this only be done for certain process types? child_process_logging::SetCrashKeyFunctions(SetCrashKeyValue, ClearCrashKeyValue); + if (!is_browser) { // Get the guid from the command line switch. std::string guid = WideToASCII( - parsed_command_line.GetSwitchValue(switches::kEnableCrashReporter)); + command_line->GetSwitchValue(switches::kEnableCrashReporter)); child_process_logging::SetClientId(guid); } } |