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

Unified Diff: ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.mm

Issue 2810193002: [ObjC ARC] Converts ios/chrome/browser/ui/tab_switcher:tab_switcher to ARC. (Closed)
Patch Set: comment Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.mm
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.mm b/ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.mm
index 65245fdda3c8c4201832c02e25c2ec60e71e03d9..fc480aa5bf73cf7966e40378764c703b4c2a3ace 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.mm
@@ -4,14 +4,16 @@
#import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_view.h"
-#import "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_cell.h"
#import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_collection_view_layout.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface TabSwitcherPanelView () {
- base::scoped_nsobject<UICollectionView> _collectionView;
- base::scoped_nsobject<TabSwitcherPanelCollectionViewLayout>
- _collectionViewLayout;
+ UICollectionView* _collectionView;
+ TabSwitcherPanelCollectionViewLayout* _collectionViewLayout;
TabSwitcherSessionType _sessionType;
}
@@ -57,11 +59,10 @@
#pragma mark - Private
- (void)loadSubviews {
- _collectionViewLayout.reset(
- [[TabSwitcherPanelCollectionViewLayout alloc] init]);
- _collectionView.reset([[UICollectionView alloc]
- initWithFrame:self.bounds
- collectionViewLayout:_collectionViewLayout.get()]);
+ _collectionViewLayout = [[TabSwitcherPanelCollectionViewLayout alloc] init];
+ _collectionView =
+ [[UICollectionView alloc] initWithFrame:self.bounds
+ collectionViewLayout:_collectionViewLayout];
if (_sessionType == TabSwitcherSessionType::DISTANT_SESSION) {
[_collectionView registerClass:[TabSwitcherDistantSessionCell class]
forCellWithReuseIdentifier:[TabSwitcherDistantSessionCell identifier]];

Powered by Google App Engine
This is Rietveld 408576698