OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #import "chrome/app/breakpad_mac.h" | 5 #import "chrome/app/breakpad_mac.h" |
6 | 6 |
7 #include <CoreFoundation/CoreFoundation.h> | 7 #include <CoreFoundation/CoreFoundation.h> |
8 #import <Foundation/Foundation.h> | 8 #import <Foundation/Foundation.h> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "base/threading/thread_restrictions.h" | 25 #include "base/threading/thread_restrictions.h" |
26 #import "breakpad/src/client/mac/Framework/Breakpad.h" | 26 #import "breakpad/src/client/mac/Framework/Breakpad.h" |
27 #include "chrome/common/child_process_logging.h" | 27 #include "chrome/common/child_process_logging.h" |
28 #include "chrome/common/chrome_paths.h" | 28 #include "chrome/common/chrome_paths.h" |
29 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
30 #include "chrome/common/crash_keys.h" | 30 #include "chrome/common/crash_keys.h" |
31 #include "chrome/common/dump_without_crashing.h" | 31 #include "chrome/common/dump_without_crashing.h" |
32 #include "chrome/common/env_vars.h" | 32 #include "chrome/common/env_vars.h" |
33 #include "chrome/common/logging_chrome.h" | 33 #include "chrome/common/logging_chrome.h" |
34 #include "chrome/installer/util/google_update_settings.h" | 34 #include "chrome/installer/util/google_update_settings.h" |
| 35 #include "components/nacl/common/nacl_switches.h" |
35 #include "native_client/src/trusted/service_runtime/osx/crash_filter.h" | 36 #include "native_client/src/trusted/service_runtime/osx/crash_filter.h" |
36 #include "policy/policy_constants.h" | 37 #include "policy/policy_constants.h" |
37 | 38 |
38 namespace { | 39 namespace { |
39 | 40 |
40 BreakpadRef gBreakpadRef = NULL; | 41 BreakpadRef gBreakpadRef = NULL; |
41 | 42 |
42 void SetCrashKeyValue(NSString* key, NSString* value) { | 43 void SetCrashKeyValue(NSString* key, NSString* value) { |
43 // Comment repeated from header to prevent confusion: | 44 // Comment repeated from header to prevent confusion: |
44 // IMPORTANT: On OS X, the key/value pairs are sent to the crash server | 45 // IMPORTANT: On OS X, the key/value pairs are sent to the crash server |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 | 319 |
319 #if !defined(DISABLE_NACL) | 320 #if !defined(DISABLE_NACL) |
320 if (process_type_switch == switches::kNaClLoaderProcess) { | 321 if (process_type_switch == switches::kNaClLoaderProcess) { |
321 BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL); | 322 BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL); |
322 } | 323 } |
323 #endif | 324 #endif |
324 | 325 |
325 // Store process type in crash dump. | 326 // Store process type in crash dump. |
326 SetCrashKeyValue(@"ptype", process_type); | 327 SetCrashKeyValue(@"ptype", process_type); |
327 } | 328 } |
OLD | NEW |