| OLD | NEW |
| 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_property_releaser.h" | 10 #import "base/mac/objc_release_properties.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 Loading... |
| 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_; | |
| 45 } | 42 } |
| 46 | 43 |
| 47 @synthesize shouldHideDoneButton = shouldHideDoneButton_; | 44 @synthesize shouldHideDoneButton = shouldHideDoneButton_; |
| 48 @synthesize collectionViewAccessibilityIdentifier = | 45 @synthesize collectionViewAccessibilityIdentifier = |
| 49 collectionViewAccessibilityIdentifier_; | 46 collectionViewAccessibilityIdentifier_; |
| 50 | 47 |
| 51 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style { | 48 - (void)dealloc { |
| 52 self = [super initWithStyle:style]; | 49 base::mac::ReleaseProperties(self); |
| 53 if (self) { | 50 [super dealloc]; |
| 54 propertyReleaser_SettingsRootCollectionViewController_.Init( | |
| 55 self, [SettingsRootCollectionViewController class]); | |
| 56 } | |
| 57 return self; | |
| 58 } | 51 } |
| 59 | 52 |
| 60 - (void)viewDidLoad { | 53 - (void)viewDidLoad { |
| 61 [super viewDidLoad]; | 54 [super viewDidLoad]; |
| 62 self.collectionView.accessibilityIdentifier = | 55 self.collectionView.accessibilityIdentifier = |
| 63 self.collectionViewAccessibilityIdentifier; | 56 self.collectionViewAccessibilityIdentifier; |
| 64 | 57 |
| 65 // Customize collection view settings. | 58 // Customize collection view settings. |
| 66 self.styler.cellStyle = MDCCollectionViewCellStyleCard; | 59 self.styler.cellStyle = MDCCollectionViewCellStyleCard; |
| 67 self.styler.separatorInset = UIEdgeInsetsMake(0, 16, 0, 16); | 60 self.styler.separatorInset = UIEdgeInsetsMake(0, 16, 0, 16); |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 break; | 256 break; |
| 264 default: | 257 default: |
| 265 NOTREACHED(); | 258 NOTREACHED(); |
| 266 break; | 259 break; |
| 267 } | 260 } |
| 268 savedBarButtonItem_.reset(); | 261 savedBarButtonItem_.reset(); |
| 269 savedBarButtonItemPosition_ = kUndefinedBarButtonItemPosition; | 262 savedBarButtonItemPosition_ = kUndefinedBarButtonItemPosition; |
| 270 } | 263 } |
| 271 | 264 |
| 272 @end | 265 @end |
| OLD | NEW |