OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/app/chrome_breakpad_client.h" | 5 #include "chrome/app/chrome_crash_reporter_client.h" |
6 | 6 |
7 #include <CoreFoundation/CoreFoundation.h> | 7 #include <CoreFoundation/CoreFoundation.h> |
8 | 8 |
9 #include "base/mac/scoped_cftyperef.h" | 9 #include "base/mac/scoped_cftyperef.h" |
10 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
11 #include "policy/policy_constants.h" | 11 #include "policy/policy_constants.h" |
12 | 12 |
13 #if !defined(DISABLE_NACL) | 13 #if !defined(DISABLE_NACL) |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #import "breakpad/src/client/mac/Framework/Breakpad.h" | 15 #import "breakpad/src/client/mac/Framework/Breakpad.h" |
(...skipping 10 matching lines...) Expand all Loading... |
26 bool NaClBreakpadCrashFilter(int exception_type, | 26 bool NaClBreakpadCrashFilter(int exception_type, |
27 int exception_code, | 27 int exception_code, |
28 mach_port_t crashing_thread, | 28 mach_port_t crashing_thread, |
29 void* context) { | 29 void* context) { |
30 return !NaClMachThreadIsInUntrusted(crashing_thread); | 30 return !NaClMachThreadIsInUntrusted(crashing_thread); |
31 } | 31 } |
32 #endif | 32 #endif |
33 | 33 |
34 } // namespace | 34 } // namespace |
35 | 35 |
36 void ChromeBreakpadClient::InstallAdditionalFilters(BreakpadRef breakpad) { | 36 void ChromeCrashReporterClient::InstallAdditionalFilters(BreakpadRef breakpad) { |
37 #if !defined(DISABLE_NACL) | 37 #if !defined(DISABLE_NACL) |
38 if (CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 38 if (CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
39 switches::kProcessType) == switches::kNaClLoaderProcess) { | 39 switches::kProcessType) == switches::kNaClLoaderProcess) { |
40 BreakpadSetFilterCallback(breakpad, NaClBreakpadCrashFilter, NULL); | 40 BreakpadSetFilterCallback(breakpad, NaClBreakpadCrashFilter, NULL); |
41 } | 41 } |
42 #endif | 42 #endif |
43 } | 43 } |
44 | 44 |
45 bool ChromeBreakpadClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) { | 45 bool ChromeCrashReporterClient::ReportingIsEnforcedByPolicy( |
| 46 bool* breakpad_enabled) { |
46 base::ScopedCFTypeRef<CFStringRef> key( | 47 base::ScopedCFTypeRef<CFStringRef> key( |
47 base::SysUTF8ToCFStringRef(policy::key::kMetricsReportingEnabled)); | 48 base::SysUTF8ToCFStringRef(policy::key::kMetricsReportingEnabled)); |
48 Boolean key_valid; | 49 Boolean key_valid; |
49 Boolean metrics_reporting_enabled = CFPreferencesGetAppBooleanValue(key, | 50 Boolean metrics_reporting_enabled = CFPreferencesGetAppBooleanValue(key, |
50 kCFPreferencesCurrentApplication, &key_valid); | 51 kCFPreferencesCurrentApplication, &key_valid); |
51 if (key_valid && | 52 if (key_valid && |
52 CFPreferencesAppValueIsForced(key, kCFPreferencesCurrentApplication)) { | 53 CFPreferencesAppValueIsForced(key, kCFPreferencesCurrentApplication)) { |
53 *breakpad_enabled = metrics_reporting_enabled; | 54 *breakpad_enabled = metrics_reporting_enabled; |
54 return true; | 55 return true; |
55 } | 56 } |
56 return false; | 57 return false; |
57 } | 58 } |
58 | 59 |
59 } // namespace chrome | 60 } // namespace chrome |
OLD | NEW |