Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_SETTINGS_COLLECTION_VIEW_CONTROLLER_H_ | 5 #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_SETTINGS_COLLECTION_VIEW_CONTROLLER_H_ |
| 6 #define IOS_CHROME_BROWSER_UI_SETTINGS_SETTINGS_COLLECTION_VIEW_CONTROLLER_H_ | 6 #define IOS_CHROME_BROWSER_UI_SETTINGS_SETTINGS_COLLECTION_VIEW_CONTROLLER_H_ |
| 7 | 7 |
| 8 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h" | 8 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h" |
| 9 #import "ios/chrome/browser/ui/settings/settings_root_collection_view_controller .h" | 9 #import "ios/chrome/browser/ui/settings/settings_root_collection_view_controller .h" |
| 10 | 10 |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 30 | 30 |
| 31 // This class is the collection view for the application settings. | 31 // This class is the collection view for the application settings. |
| 32 @interface SettingsCollectionViewController | 32 @interface SettingsCollectionViewController |
| 33 : SettingsRootCollectionViewController<SettingsControllerProtocol> | 33 : SettingsRootCollectionViewController<SettingsControllerProtocol> |
| 34 | 34 |
| 35 // The controller used to signin on this screen. Returns nil unless a signin is | 35 // The controller used to signin on this screen. Returns nil unless a signin is |
| 36 // currently occuring. | 36 // currently occuring. |
| 37 @property(weak, nonatomic, readonly) | 37 @property(weak, nonatomic, readonly) |
| 38 SigninInteractionController* signinInteractionController; | 38 SigninInteractionController* signinInteractionController; |
| 39 | 39 |
| 40 // Initializes a new SettingsCollectionViewController. |mainBrowserState|, | 40 // Initializes a new SettingsCollectionViewController. |mainBrowserState| must |
| 41 // |currentBrowserState| and |dataSource| must not be nil. | 41 // not be nil. |
| 42 // If |currentBrowserState| is not off the record, then it must be equal to | |
| 43 // |mainBrowserState|. | |
| 44 - (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)mainBrowserState | 42 - (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)mainBrowserState |
|
Eugene But (OOO till 7-30)
2017/05/25 14:47:33
nit: Should this be just |browserState|?
pkl (ping after 24h if needed)
2017/05/26 17:34:18
Renamed to browserState here and changed ivar _mai
| |
| 45 currentBrowserState: | |
| 46 (ios::ChromeBrowserState*)currentBrowserState | |
| 47 NS_DESIGNATED_INITIALIZER; | 43 NS_DESIGNATED_INITIALIZER; |
| 48 | 44 |
| 49 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style | 45 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style |
| 50 NS_UNAVAILABLE; | 46 NS_UNAVAILABLE; |
| 51 | 47 |
| 52 - (instancetype)init NS_UNAVAILABLE; | 48 - (instancetype)init NS_UNAVAILABLE; |
| 53 | 49 |
| 54 @end | 50 @end |
| 55 | 51 |
| 56 #endif // IOS_CHROME_BROWSER_UI_SETTINGS_SETTINGS_COLLECTION_VIEW_CONTROLLER_H_ | 52 #endif // IOS_CHROME_BROWSER_UI_SETTINGS_SETTINGS_COLLECTION_VIEW_CONTROLLER_H_ |
| OLD | NEW |