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

Side by Side Diff: ios/chrome/app/safe_mode_crashing_modules_config.mm

Issue 2707853003: [ObjC ARC] Converts ios/chrome/app:app to ARC. (Closed)
Patch Set: asdf Created 3 years, 10 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
« no previous file with comments | « ios/chrome/app/deferred_initialization_runner.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #import "ios/chrome/app/safe_mode_crashing_modules_config.h" 5 #import "ios/chrome/app/safe_mode_crashing_modules_config.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/mac/foundation_util.h" 8 #include "base/mac/foundation_util.h"
9 #import "base/mac/scoped_nsobject.h" 9
10 #if !defined(__has_feature) || !__has_feature(objc_arc)
11 #error "This file requires ARC support."
12 #endif
10 13
11 namespace { 14 namespace {
12 15
13 NSString* const kStartupCrashModulesKey = @"StartupCrashModules"; 16 NSString* const kStartupCrashModulesKey = @"StartupCrashModules";
14 NSString* const kModuleFriendlyNameKey = @"ModuleFriendlyName"; 17 NSString* const kModuleFriendlyNameKey = @"ModuleFriendlyName";
15 18
16 } // namespace 19 } // namespace
17 20
18 @interface SafeModeCrashingModulesConfig () { 21 @implementation SafeModeCrashingModulesConfig {
19 base::scoped_nsobject<NSDictionary> _configuration; 22 NSDictionary* _configuration;
20 } 23 }
21 @end
22
23 @implementation SafeModeCrashingModulesConfig
24 24
25 + (SafeModeCrashingModulesConfig*)sharedInstance { 25 + (SafeModeCrashingModulesConfig*)sharedInstance {
26 static SafeModeCrashingModulesConfig* instance = 26 static SafeModeCrashingModulesConfig* instance =
27 [[SafeModeCrashingModulesConfig alloc] init]; 27 [[SafeModeCrashingModulesConfig alloc] init];
28 return instance; 28 return instance;
29 } 29 }
30 30
31 - (instancetype)init { 31 - (instancetype)init {
32 self = [super init]; 32 self = [super init];
33 if (self) { 33 if (self) {
34 NSString* configPath = 34 NSString* configPath =
35 [[NSBundle mainBundle] pathForResource:@"SafeModeCrashingModules" 35 [[NSBundle mainBundle] pathForResource:@"SafeModeCrashingModules"
36 ofType:@"plist"]; 36 ofType:@"plist"];
37 _configuration.reset( 37 _configuration = [[NSDictionary alloc] initWithContentsOfFile:configPath];
38 [[NSDictionary alloc] initWithContentsOfFile:configPath]);
39 } 38 }
40 return self; 39 return self;
41 } 40 }
42 41
43 - (NSString*)startupCrashModuleFriendlyName:(NSString*)modulePath { 42 - (NSString*)startupCrashModuleFriendlyName:(NSString*)modulePath {
44 NSDictionary* modules = base::mac::ObjCCastStrict<NSDictionary>( 43 NSDictionary* modules = base::mac::ObjCCastStrict<NSDictionary>(
45 [_configuration objectForKey:kStartupCrashModulesKey]); 44 [_configuration objectForKey:kStartupCrashModulesKey]);
46 NSDictionary* module = 45 NSDictionary* module =
47 base::mac::ObjCCastStrict<NSDictionary>(modules[modulePath]); 46 base::mac::ObjCCastStrict<NSDictionary>(modules[modulePath]);
48 return base::mac::ObjCCast<NSString>(module[kModuleFriendlyNameKey]); 47 return base::mac::ObjCCast<NSString>(module[kModuleFriendlyNameKey]);
49 } 48 }
50 49
51 @end 50 @end
OLDNEW
« no previous file with comments | « ios/chrome/app/deferred_initialization_runner.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698