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

Side by Side Diff: ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm

Issue 2610923005: Replace ObjCPropertyReleaser with ReleaseProperties() project-wide. (Closed)
Patch Set: weak -> assign Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #import "ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h" 5 #import "ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h"
6 6
7 #include "base/mac/objc_property_releaser.h" 7 #include "base/mac/objc_release_properties.h"
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "components/bookmarks/browser/base_bookmark_model_observer.h" 9 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
10 #include "components/bookmarks/browser/bookmark_model.h" 10 #include "components/bookmarks/browser/bookmark_model.h"
11 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" 11 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
13 #import "ios/chrome/browser/ui/bookmarks/bookmark_collection_view.h" 13 #import "ios/chrome/browser/ui/bookmarks/bookmark_collection_view.h"
14 #import "ios/chrome/browser/ui/url_loader.h" 14 #import "ios/chrome/browser/ui/url_loader.h"
15 15
16 using bookmarks::BookmarkNode; 16 using bookmarks::BookmarkNode;
17 17
18 @interface BookmarkHomeViewController () { 18 @interface BookmarkHomeViewController ()
19 base::mac::ObjCPropertyReleaser _propertyReleaser_BookmarkHomeViewController;
20 }
21 19
22 // Redefined to be readwrite. 20 // Redefined to be readwrite.
23 @property(nonatomic, retain, readwrite) NSMutableArray* editIndexPaths; 21 @property(nonatomic, retain, readwrite) NSMutableArray* editIndexPaths;
24 22
25 // Returns the parent, if all the bookmarks are siblings. 23 // Returns the parent, if all the bookmarks are siblings.
26 // Otherwise returns the mobile_node. 24 // Otherwise returns the mobile_node.
27 + (const BookmarkNode*) 25 + (const BookmarkNode*)
28 defaultMoveFolderFromBookmarks:(const std::set<const BookmarkNode*>&)bookmarks 26 defaultMoveFolderFromBookmarks:(const std::set<const BookmarkNode*>&)bookmarks
29 model:(bookmarks::BookmarkModel*)model; 27 model:(bookmarks::BookmarkModel*)model;
30 @end 28 @end
31 29
32 @implementation BookmarkHomeViewController 30 @implementation BookmarkHomeViewController
33 @synthesize delegate = _delegate; 31 @synthesize delegate = _delegate;
34 @synthesize editIndexPaths = _editIndexPaths; 32 @synthesize editIndexPaths = _editIndexPaths;
35 @synthesize editing = _editing; 33 @synthesize editing = _editing;
36 @synthesize bookmarks = _bookmarks; 34 @synthesize bookmarks = _bookmarks;
37 @synthesize loader = _loader; 35 @synthesize loader = _loader;
38 @synthesize browserState = _browserState; 36 @synthesize browserState = _browserState;
39 37
40 - (instancetype)initWithLoader:(id<UrlLoader>)loader 38 - (instancetype)initWithLoader:(id<UrlLoader>)loader
41 browserState:(ios::ChromeBrowserState*)browserState { 39 browserState:(ios::ChromeBrowserState*)browserState {
42 DCHECK(browserState); 40 DCHECK(browserState);
43 self = [super initWithNibName:nil bundle:nil]; 41 self = [super initWithNibName:nil bundle:nil];
44 if (self) { 42 if (self) {
45 _propertyReleaser_BookmarkHomeViewController.Init(
46 self, [BookmarkHomeViewController class]);
47
48 _browserState = browserState->GetOriginalChromeBrowserState(); 43 _browserState = browserState->GetOriginalChromeBrowserState();
49 _loader = loader; 44 _loader = loader;
50 45
51 _bookmarks = ios::BookmarkModelFactory::GetForBrowserState(_browserState); 46 _bookmarks = ios::BookmarkModelFactory::GetForBrowserState(_browserState);
52 _editIndexPaths = [[NSMutableArray alloc] init]; 47 _editIndexPaths = [[NSMutableArray alloc] init];
53 48
54 [self resetEditNodes]; 49 [self resetEditNodes];
55 } 50 }
56 return self; 51 return self;
57 } 52 }
58 53
54 - (void)dealloc {
55 base::mac::ReleaseProperties(self);
56 [super dealloc];
57 }
58
59 - (void)loadView { 59 - (void)loadView {
60 CGRect frame = [[UIScreen mainScreen] bounds]; 60 CGRect frame = [[UIScreen mainScreen] bounds];
61 self.view = 61 self.view =
62 base::scoped_nsobject<UIView>([[UIView alloc] initWithFrame:frame]); 62 base::scoped_nsobject<UIView>([[UIView alloc] initWithFrame:frame]);
63 } 63 }
64 64
65 - (void)resetEditNodes { 65 - (void)resetEditNodes {
66 _editNodes = std::set<const BookmarkNode*>(); 66 _editNodes = std::set<const BookmarkNode*>();
67 _editNodesOrdered = std::vector<const BookmarkNode*>(); 67 _editNodesOrdered = std::vector<const BookmarkNode*>();
68 [self.editIndexPaths removeAllObjects]; 68 [self.editIndexPaths removeAllObjects];
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 - (const std::set<const BookmarkNode*>&)editNodes { 140 - (const std::set<const BookmarkNode*>&)editNodes {
141 return _editNodes; 141 return _editNodes;
142 } 142 }
143 143
144 - (void)setEditNodes:(const std::set<const BookmarkNode*>&)editNodes { 144 - (void)setEditNodes:(const std::set<const BookmarkNode*>&)editNodes {
145 _editNodes = editNodes; 145 _editNodes = editNodes;
146 } 146 }
147 147
148 @end 148 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698