Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/app/breakpad_mac.mm

Issue 16867015: Revert r207951 - "Separate NaCl switches to their own file." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/DEPS ('k') | chrome/app/chrome_main_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/crash_keys.h" 29 #include "chrome/common/crash_keys.h"
30 #include "chrome/common/dump_without_crashing.h" 30 #include "chrome/common/dump_without_crashing.h"
31 #include "chrome/common/env_vars.h" 31 #include "chrome/common/env_vars.h"
32 #include "chrome/common/logging_chrome.h" 32 #include "chrome/common/logging_chrome.h"
33 #include "chrome/installer/util/google_update_settings.h" 33 #include "chrome/installer/util/google_update_settings.h"
34 #include "components/breakpad/common/breakpad_paths.h" 34 #include "components/breakpad/common/breakpad_paths.h"
35 #include "components/nacl/common/nacl_switches.h"
36 #include "native_client/src/trusted/service_runtime/osx/crash_filter.h" 35 #include "native_client/src/trusted/service_runtime/osx/crash_filter.h"
37 #include "policy/policy_constants.h" 36 #include "policy/policy_constants.h"
38 37
39 namespace { 38 namespace {
40 39
41 BreakpadRef gBreakpadRef = NULL; 40 BreakpadRef gBreakpadRef = NULL;
42 41
43 void SetCrashKeyValue(NSString* key, NSString* value) { 42 void SetCrashKeyValue(NSString* key, NSString* value) {
44 // Comment repeated from header to prevent confusion: 43 // Comment repeated from header to prevent confusion:
45 // IMPORTANT: On OS X, the key/value pairs are sent to the crash server 44 // 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
319 318
320 #if !defined(DISABLE_NACL) 319 #if !defined(DISABLE_NACL)
321 if (process_type_switch == switches::kNaClLoaderProcess) { 320 if (process_type_switch == switches::kNaClLoaderProcess) {
322 BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL); 321 BreakpadSetFilterCallback(gBreakpadRef, NaClBreakpadCrashFilter, NULL);
323 } 322 }
324 #endif 323 #endif
325 324
326 // Store process type in crash dump. 325 // Store process type in crash dump.
327 SetCrashKeyValue(@"ptype", process_type); 326 SetCrashKeyValue(@"ptype", process_type);
328 } 327 }
OLDNEW
« no previous file with comments | « chrome/app/DEPS ('k') | chrome/app/chrome_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698