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

Unified Diff: ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_panel_controller.mm

Issue 2791393003: [ObjC ARC] Converts ios/chrome/browser/ui/ntp/recent_tabs:recent_tabs to ARC. (Closed)
Patch Set: weak 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/ntp/recent_tabs/recent_tabs_panel_controller.mm
diff --git a/ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_panel_controller.mm b/ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_panel_controller.mm
index 3ad854d22fb77d7b843bf3dff088cf7cadec2a2a..5c86b8b9ee3c966f3b58607e17a26dbea7baed80 100644
--- a/ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_panel_controller.mm
+++ b/ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_panel_controller.mm
@@ -6,7 +6,6 @@
#include <memory>
-#include "base/mac/scoped_nsobject.h"
#include "components/browser_sync/profile_sync_service.h"
#include "components/sessions/core/tab_restore_service.h"
#include "components/signin/core/browser/signin_manager.h"
@@ -22,13 +21,17 @@
#import "ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_table_view_controller.h"
#import "ios/chrome/browser/ui/ntp/recent_tabs/synced_sessions_bridge.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface RecentTabsPanelController ()<SyncedSessionsObserver,
RecentTabsTableViewControllerDelegate> {
std::unique_ptr<synced_sessions::SyncedSessionsObserverBridge>
_syncedSessionsObserver;
std::unique_ptr<recent_tabs::ClosedTabsObserverBridge> _closedTabsObserver;
SessionsSyncUserState _userState;
- base::scoped_nsobject<RecentTabsTableViewController> _tableViewController;
+ RecentTabsTableViewController* _tableViewController;
ios::ChromeBrowserState* _browserState; // Weak.
}
@@ -57,9 +60,9 @@
- (instancetype)initWithLoader:(id<UrlLoader>)loader
browserState:(ios::ChromeBrowserState*)browserState {
- return [self initWithController:[[[RecentTabsTableViewController alloc]
+ return [self initWithController:[[RecentTabsTableViewController alloc]
initWithBrowserState:browserState
- loader:loader] autorelease]
+ loader:loader]
browserState:browserState];
}
@@ -70,7 +73,7 @@
DCHECK(controller);
DCHECK(browserState);
_browserState = browserState;
- _tableViewController.reset([controller retain]);
+ _tableViewController = controller;
[_tableViewController setDelegate:self];
[self initObservers];
[self reloadSessions];
@@ -81,7 +84,6 @@
- (void)dealloc {
[_tableViewController setDelegate:nil];
[self deallocObservers];
- [super dealloc];
}
- (void)initObservers {

Powered by Google App Engine
This is Rietveld 408576698