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

Side by Side Diff: ios/chrome/browser/ui/bookmarks/bookmark_menu_item.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_menu_item.h" 5 #import "ios/chrome/browser/ui/bookmarks/bookmark_menu_item.h"
6 6
7 #include "base/hash.h" 7 #include "base/hash.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/mac/objc_property_releaser.h" 9 #include "base/mac/objc_release_properties.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
11 #include "components/bookmarks/browser/bookmark_node.h" 11 #include "components/bookmarks/browser/bookmark_node.h"
12 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" 12 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
13 #include "ios/chrome/grit/ios_strings.h" 13 #include "ios/chrome/grit/ios_strings.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 15
16 using bookmarks::BookmarkNode; 16 using bookmarks::BookmarkNode;
17 17
18 namespace bookmarks { 18 namespace bookmarks {
19 BOOL NumberIsValidMenuItemType(int number) { 19 BOOL NumberIsValidMenuItemType(int number) {
20 // Invalid and deprecated numbers. 20 // Invalid and deprecated numbers.
21 if (number < 0 || number > MenuItemLast) 21 if (number < 0 || number > MenuItemLast)
22 return NO; 22 return NO;
23 MenuItemType type = static_cast<MenuItemType>(number); 23 MenuItemType type = static_cast<MenuItemType>(number);
24 switch (type) { 24 switch (type) {
25 case MenuItemAll: 25 case MenuItemAll:
26 case MenuItemFolder: 26 case MenuItemFolder:
27 return YES; 27 return YES;
28 28
29 case MenuItemDivider: 29 case MenuItemDivider:
30 case MenuItemSectionHeader: 30 case MenuItemSectionHeader:
31 return NO; 31 return NO;
32 } 32 }
33 } 33 }
34 } // namespace bookmarks 34 } // namespace bookmarks
35 35
36 @interface BookmarkMenuItem () { 36 @interface BookmarkMenuItem ()
37 base::mac::ObjCPropertyReleaser _propertyReleaser_BookmarkMenuItem;
38 }
39 // Redefined to be read-write. 37 // Redefined to be read-write.
40 @property(nonatomic, assign) const BookmarkNode* folder; 38 @property(nonatomic, assign) const BookmarkNode* folder;
41 @property(nonatomic, assign) const BookmarkNode* rootAncestor; 39 @property(nonatomic, assign) const BookmarkNode* rootAncestor;
42 // Redefined to be read-write. 40 // Redefined to be read-write.
43 @property(nonatomic, assign) bookmarks::MenuItemType type; 41 @property(nonatomic, assign) bookmarks::MenuItemType type;
44 // Redefined to be read-write. 42 // Redefined to be read-write.
45 @property(nonatomic, copy) NSString* sectionTitle; 43 @property(nonatomic, copy) NSString* sectionTitle;
46 @end 44 @end
47 45
48 @implementation BookmarkMenuItem 46 @implementation BookmarkMenuItem
49 @synthesize folder = _folder; 47 @synthesize folder = _folder;
50 @synthesize rootAncestor = _rootAncestor; 48 @synthesize rootAncestor = _rootAncestor;
51 @synthesize sectionTitle = _sectionTitle; 49 @synthesize sectionTitle = _sectionTitle;
52 @synthesize type = _type; 50 @synthesize type = _type;
53 51
54 - (instancetype)init { 52 - (void)dealloc {
55 self = [super init]; 53 base::mac::ReleaseProperties(self);
56 if (self) { 54 [super dealloc];
57 _propertyReleaser_BookmarkMenuItem.Init(self, [BookmarkMenuItem class]);
58 }
59 return self;
60 } 55 }
61 56
62 - (UIAccessibilityTraits)accessibilityTraits { 57 - (UIAccessibilityTraits)accessibilityTraits {
63 switch (self.type) { 58 switch (self.type) {
64 case bookmarks::MenuItemAll: 59 case bookmarks::MenuItemAll:
65 case bookmarks::MenuItemFolder: 60 case bookmarks::MenuItemFolder:
66 return super.accessibilityTraits |= UIAccessibilityTraitButton; 61 return super.accessibilityTraits |= UIAccessibilityTraitButton;
67 case bookmarks::MenuItemSectionHeader: 62 case bookmarks::MenuItemSectionHeader:
68 return super.accessibilityTraits |= UIAccessibilityTraitHeader; 63 return super.accessibilityTraits |= UIAccessibilityTraitHeader;
69 case bookmarks::MenuItemDivider: 64 case bookmarks::MenuItemDivider:
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 } 229 }
235 230
236 + (BookmarkMenuItem*)sectionMenuItemWithTitle:(NSString*)title { 231 + (BookmarkMenuItem*)sectionMenuItemWithTitle:(NSString*)title {
237 BookmarkMenuItem* item = [[[BookmarkMenuItem alloc] init] autorelease]; 232 BookmarkMenuItem* item = [[[BookmarkMenuItem alloc] init] autorelease];
238 item.type = bookmarks::MenuItemSectionHeader; 233 item.type = bookmarks::MenuItemSectionHeader;
239 item.sectionTitle = title; 234 item.sectionTitle = title;
240 return item; 235 return item;
241 } 236 }
242 237
243 @end 238 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698