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

Unified Diff: ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm

Issue 2746473003: [ObjC ARC] Converts ios/chrome/browser/ui/bookmarks:bookmarks to ARC. (Closed)
Patch Set: fix test Created 3 years, 9 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/bookmarks/bookmark_interaction_controller.mm
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm
index 50f0d08d2a2d5a9d3dcebaee55157defa177912b..44c9dd0d046adb6d217b9bdff23baafa7f4a85c0 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm
@@ -6,11 +6,8 @@
#include <stdint.h>
-#import "base/ios/weak_nsobject.h"
#include "base/logging.h"
#include "base/mac/bind_objc_block.h"
-#include "base/mac/objc_property_releaser.h"
-#include "base/mac/scoped_nsobject.h"
#include "base/metrics/user_metrics.h"
#include "base/metrics/user_metrics_action.h"
#include "base/strings/sys_string_conversions.h"
@@ -37,6 +34,10 @@
#include "ios/web/public/referrer.h"
#include "ui/base/l10n/l10n_util.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
@@ -55,23 +56,20 @@ const int64_t kLastUsedFolderNone = -1;
ios::ChromeBrowserState* _browserState; // weak
// The designated url loader.
- base::WeakNSProtocol<id<UrlLoader>> _loader;
+ __weak id<UrlLoader> _loader;
// The parent controller on top of which the UI needs to be presented.
- base::WeakNSObject<UIViewController> _parentController;
-
- base::mac::ObjCPropertyReleaser
- _propertyReleaser_BookmarkInteractionController;
+ __weak UIViewController* _parentController;
}
// The bookmark model in use.
@property(nonatomic, assign) BookmarkModel* bookmarkModel;
// A reference to the potentially presented bookmark browser.
-@property(nonatomic, retain) BookmarkHomeViewController* bookmarkBrowser;
+@property(nonatomic, strong) BookmarkHomeViewController* bookmarkBrowser;
// A reference to the potentially presented single bookmark editor.
-@property(nonatomic, retain) BookmarkEditViewController* bookmarkEditor;
+@property(nonatomic, strong) BookmarkEditViewController* bookmarkEditor;
// The user wants to bookmark the current tab.
- (void)addBookmarkForTab:(Tab*)tab;
@@ -88,7 +86,6 @@ const int64_t kLastUsedFolderNone = -1;
@end
@implementation BookmarkInteractionController
-
@synthesize bookmarkBrowser = _bookmarkBrowser;
@synthesize bookmarkEditor = _bookmarkEditor;
@synthesize bookmarkModel = _bookmarkModel;
@@ -129,14 +126,12 @@ const int64_t kLastUsedFolderNone = -1;
parentController:(UIViewController*)parentController {
self = [super init];
if (self) {
- _propertyReleaser_BookmarkInteractionController.Init(
- self, [BookmarkInteractionController class]);
// Bookmarks are always opened with the main browser state, even in
// incognito mode.
_currentBrowserState = browserState;
_browserState = browserState->GetOriginalChromeBrowserState();
- _loader.reset(loader);
- _parentController.reset(parentController);
+ _loader = loader;
+ _parentController = parentController;
_bookmarkModel =
ios::BookmarkModelFactory::GetForBrowserState(_browserState);
DCHECK(_bookmarkModel);
@@ -148,7 +143,6 @@ const int64_t kLastUsedFolderNone = -1;
- (void)dealloc {
_bookmarkBrowser.delegate = nil;
_bookmarkEditor.delegate = nil;
- [super dealloc];
}
- (void)addBookmarkForTab:(Tab*)tab {
@@ -158,13 +152,11 @@ const int64_t kLastUsedFolderNone = -1;
self.bookmarkModel->AddURL(defaultFolder, defaultFolder->child_count(),
base::SysNSStringToUTF16(tab.title), tab.url);
- MDCSnackbarMessageAction* action =
- [[[MDCSnackbarMessageAction alloc] init] autorelease];
- base::WeakNSObject<BookmarkInteractionController> weakSelf(self);
- base::WeakNSObject<Tab> weakTab(tab);
+ MDCSnackbarMessageAction* action = [[MDCSnackbarMessageAction alloc] init];
+ __weak BookmarkInteractionController* weakSelf = self;
+ __weak Tab* weakTab = tab;
action.handler = ^{
- base::scoped_nsobject<BookmarkInteractionController> strongSelf(
- [weakSelf retain]);
+ BookmarkInteractionController* strongSelf = weakSelf;
if (!strongSelf || !weakTab)
return;
[strongSelf presentBookmarkForTab:weakTab];
@@ -198,15 +190,14 @@ const int64_t kLastUsedFolderNone = -1;
[self dismissSnackbar];
- base::scoped_nsobject<BookmarkEditViewController> bookmarkEditor(
+ BookmarkEditViewController* bookmarkEditor =
[[BookmarkEditViewController alloc] initWithBookmark:bookmark
- browserState:_browserState]);
+ browserState:_browserState];
self.bookmarkEditor = bookmarkEditor;
self.bookmarkEditor.delegate = self;
- base::scoped_nsobject<UINavigationController> navController(
- [[BookmarkNavigationController alloc]
- initWithRootViewController:self.bookmarkEditor]);
- navController.get().modalPresentationStyle = UIModalPresentationFormSheet;
+ UINavigationController* navController = [[BookmarkNavigationController alloc]
+ initWithRootViewController:self.bookmarkEditor];
+ navController.modalPresentationStyle = UIModalPresentationFormSheet;
[_parentController presentViewController:navController
animated:YES
completion:nil];
@@ -229,8 +220,8 @@ const int64_t kLastUsedFolderNone = -1;
- (void)presentBookmarks {
DCHECK(!self.bookmarkBrowser && !self.bookmarkEditor);
- base::scoped_nsobject<BookmarkControllerFactory> bookmarkControllerFactory(
- [[BookmarkControllerFactory alloc] init]);
+ BookmarkControllerFactory* bookmarkControllerFactory =
+ [[BookmarkControllerFactory alloc] init];
self.bookmarkBrowser = [bookmarkControllerFactory
bookmarkControllerWithBrowserState:_currentBrowserState
loader:_loader];
« no previous file with comments | « ios/chrome/browser/ui/bookmarks/bookmark_home_waiting_view.mm ('k') | ios/chrome/browser/ui/bookmarks/bookmark_menu_cell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698