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

Side by Side Diff: ios/chrome/browser/ui/settings/settings_root_collection_view_controller.mm

Issue 2881183002: Revert of Replace ObjCPropertyReleaser with ReleaseProperties() project-wide. (Closed)
Patch Set: Created 3 years, 7 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/browser/ui/settings/settings_root_collection_view_controller .h" 5 #import "ios/chrome/browser/ui/settings/settings_root_collection_view_controller .h"
6 6
7 #include "base/ios/ios_util.h" 7 #include "base/ios/ios_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #import "base/mac/foundation_util.h" 9 #import "base/mac/foundation_util.h"
10 #import "base/mac/objc_release_properties.h" 10 #import "base/mac/objc_property_releaser.h"
11 #import "base/mac/scoped_nsobject.h" 11 #import "base/mac/scoped_nsobject.h"
12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
13 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h" 13 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
14 #include "ios/chrome/browser/ui/commands/ios_command_ids.h" 14 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
15 #import "ios/chrome/browser/ui/commands/open_url_command.h" 15 #import "ios/chrome/browser/ui/commands/open_url_command.h"
16 #import "ios/chrome/browser/ui/settings/bar_button_activity_indicator.h" 16 #import "ios/chrome/browser/ui/settings/bar_button_activity_indicator.h"
17 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h" 17 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
18 #import "ios/chrome/browser/ui/settings/settings_utils.h" 18 #import "ios/chrome/browser/ui/settings/settings_utils.h"
19 #include "ios/chrome/browser/ui/ui_util.h" 19 #include "ios/chrome/browser/ui/ui_util.h"
20 #import "ios/chrome/browser/ui/uikit_ui_util.h" 20 #import "ios/chrome/browser/ui/uikit_ui_util.h"
(...skipping 11 matching lines...) Expand all
32 // Dimension of the authentication operation activity indicator frame. 32 // Dimension of the authentication operation activity indicator frame.
33 const CGFloat kActivityIndicatorDimensionIPad = 64; 33 const CGFloat kActivityIndicatorDimensionIPad = 64;
34 const CGFloat kActivityIndicatorDimensionIPhone = 56; 34 const CGFloat kActivityIndicatorDimensionIPhone = 56;
35 35
36 } // namespace 36 } // namespace
37 37
38 @implementation SettingsRootCollectionViewController { 38 @implementation SettingsRootCollectionViewController {
39 SavedBarButtomItemPositionEnum savedBarButtonItemPosition_; 39 SavedBarButtomItemPositionEnum savedBarButtonItemPosition_;
40 base::scoped_nsobject<UIBarButtonItem> savedBarButtonItem_; 40 base::scoped_nsobject<UIBarButtonItem> savedBarButtonItem_;
41 base::scoped_nsobject<UIView> veil_; 41 base::scoped_nsobject<UIView> veil_;
42
43 base::mac::ObjCPropertyReleaser
44 propertyReleaser_SettingsRootCollectionViewController_;
42 } 45 }
43 46
44 @synthesize shouldHideDoneButton = shouldHideDoneButton_; 47 @synthesize shouldHideDoneButton = shouldHideDoneButton_;
45 @synthesize collectionViewAccessibilityIdentifier = 48 @synthesize collectionViewAccessibilityIdentifier =
46 collectionViewAccessibilityIdentifier_; 49 collectionViewAccessibilityIdentifier_;
47 50
48 - (void)dealloc { 51 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style {
49 base::mac::ReleaseProperties(self); 52 self = [super initWithStyle:style];
50 [super dealloc]; 53 if (self) {
54 propertyReleaser_SettingsRootCollectionViewController_.Init(
55 self, [SettingsRootCollectionViewController class]);
56 }
57 return self;
51 } 58 }
52 59
53 - (void)viewDidLoad { 60 - (void)viewDidLoad {
54 [super viewDidLoad]; 61 [super viewDidLoad];
55 self.collectionView.accessibilityIdentifier = 62 self.collectionView.accessibilityIdentifier =
56 self.collectionViewAccessibilityIdentifier; 63 self.collectionViewAccessibilityIdentifier;
57 64
58 // Customize collection view settings. 65 // Customize collection view settings.
59 self.styler.cellStyle = MDCCollectionViewCellStyleCard; 66 self.styler.cellStyle = MDCCollectionViewCellStyleCard;
60 self.styler.separatorInset = UIEdgeInsetsMake(0, 16, 0, 16); 67 self.styler.separatorInset = UIEdgeInsetsMake(0, 16, 0, 16);
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 break; 263 break;
257 default: 264 default:
258 NOTREACHED(); 265 NOTREACHED();
259 break; 266 break;
260 } 267 }
261 savedBarButtonItem_.reset(); 268 savedBarButtonItem_.reset();
262 savedBarButtonItemPosition_ = kUndefinedBarButtonItemPosition; 269 savedBarButtonItemPosition_ = kUndefinedBarButtonItemPosition;
263 } 270 }
264 271
265 @end 272 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698