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

Unified Diff: ios/chrome/browser/ui/bookmarks/bookmark_home_view_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_home_view_controller.mm
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm
index b22b6cc8ed4c7a5372b01ea0cac893897ed2fbcb..cd277517d80e8b279519e0ccb78fa1b85a3ca27f 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm
@@ -4,8 +4,6 @@
#import "ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h"
-#include "base/mac/objc_property_releaser.h"
-#include "base/mac/scoped_nsobject.h"
#include "components/bookmarks/browser/base_bookmark_model_observer.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -13,14 +11,16 @@
#import "ios/chrome/browser/ui/bookmarks/bookmark_collection_view.h"
#import "ios/chrome/browser/ui/url_loader.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
using bookmarks::BookmarkNode;
-@interface BookmarkHomeViewController () {
- base::mac::ObjCPropertyReleaser _propertyReleaser_BookmarkHomeViewController;
-}
+@interface BookmarkHomeViewController ()
// Redefined to be readwrite.
-@property(nonatomic, retain, readwrite) NSMutableArray* editIndexPaths;
+@property(nonatomic, strong, readwrite) NSMutableArray* editIndexPaths;
// Returns the parent, if all the bookmarks are siblings.
// Otherwise returns the mobile_node.
@@ -42,9 +42,6 @@ defaultMoveFolderFromBookmarks:(const std::set<const BookmarkNode*>&)bookmarks
DCHECK(browserState);
self = [super initWithNibName:nil bundle:nil];
if (self) {
- _propertyReleaser_BookmarkHomeViewController.Init(
- self, [BookmarkHomeViewController class]);
-
_browserState = browserState->GetOriginalChromeBrowserState();
_loader = loader;
@@ -58,8 +55,7 @@ defaultMoveFolderFromBookmarks:(const std::set<const BookmarkNode*>&)bookmarks
- (void)loadView {
CGRect frame = [[UIScreen mainScreen] bounds];
- self.view =
- base::scoped_nsobject<UIView>([[UIView alloc] initWithFrame:frame]);
+ self.view = [[UIView alloc] initWithFrame:frame];
}
- (void)resetEditNodes {

Powered by Google App Engine
This is Rietveld 408576698