| 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" |
| 11 #include "base/base_switches.h" | 11 #include "base/base_switches.h" |
| 12 #import "base/basictypes.h" | 12 #import "base/basictypes.h" |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/debug/crash_logging.h" | 14 #include "base/debug/crash_logging.h" |
| 15 #include "base/file_util.h" | 15 #include "base/file_util.h" |
| 16 #include "base/files/file_path.h" | 16 #include "base/files/file_path.h" |
| 17 #import "base/logging.h" | 17 #import "base/logging.h" |
| 18 #include "base/mac/bundle_locations.h" | 18 #include "base/mac/bundle_locations.h" |
| 19 #include "base/mac/mac_util.h" | 19 #include "base/mac/mac_util.h" |
| 20 #include "base/mac/scoped_cftyperef.h" | 20 #include "base/mac/scoped_cftyperef.h" |
| 21 #import "base/mac/scoped_nsautorelease_pool.h" | 21 #import "base/mac/scoped_nsautorelease_pool.h" |
| 22 #include "base/strings/sys_string_conversions.h" | 22 #include "base/strings/sys_string_conversions.h" |
| 23 #include "base/threading/platform_thread.h" | 23 #include "base/threading/platform_thread.h" |
| 24 #include "base/threading/thread_restrictions.h" | 24 #include "base/threading/thread_restrictions.h" |
| 25 #import "breakpad/src/client/mac/Framework/Breakpad.h" | 25 #import "breakpad/src/client/mac/Framework/Breakpad.h" |
| 26 #include "chrome/common/child_process_logging.h" | 26 #include "chrome/common/child_process_logging.h" |
| 27 #include "chrome/common/chrome_switches.h" | |
| 28 #include "chrome/common/crash_keys.h" | 27 #include "chrome/common/crash_keys.h" |
| 29 #include "chrome/common/env_vars.h" | 28 #include "chrome/common/env_vars.h" |
| 30 #include "chrome/installer/util/google_update_settings.h" | 29 #include "chrome/installer/util/google_update_settings.h" |
| 30 #include "content/public/common/content_switches.h" |
| 31 #include "components/breakpad/breakpad_client.h" | 31 #include "components/breakpad/breakpad_client.h" |
| 32 #include "components/nacl/common/nacl_switches.h" | 32 #include "components/nacl/common/nacl_switches.h" |
| 33 #include "native_client/src/trusted/service_runtime/osx/crash_filter.h" | 33 #include "native_client/src/trusted/service_runtime/osx/crash_filter.h" |
| 34 #include "policy/policy_constants.h" | 34 #include "policy/policy_constants.h" |
| 35 | 35 |
| 36 namespace { | 36 namespace { |
| 37 | 37 |
| 38 BreakpadRef gBreakpadRef = NULL; | 38 BreakpadRef gBreakpadRef = NULL; |
| 39 | 39 |
| 40 void SetCrashKeyValue(NSString* key, NSString* value) { | 40 void SetCrashKeyValue(NSString* key, NSString* value) { |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 | 295 |
| 296 #if !defined(DISABLE_NACL) | 296 #if !defined(DISABLE_NACL) |
| 297 if (process_type_switch == switches::kNaClLoaderProcess) { | 297 if (process_type_switch == switches::kNaClLoaderProcess) { |
| 298 BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL); | 298 BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL); |
| 299 } | 299 } |
| 300 #endif | 300 #endif |
| 301 | 301 |
| 302 // Store process type in crash dump. | 302 // Store process type in crash dump. |
| 303 SetCrashKeyValue(@"ptype", process_type); | 303 SetCrashKeyValue(@"ptype", process_type); |
| 304 } | 304 } |
| OLD | NEW |