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

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h

Issue 1407103008: mac: Stop using __weak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 1 month 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: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h
index d422faa23a70f55d6a285d9abc3a4d4830c89314..ce6138d9a632eff964d9f4a2c72f2e3e002cfca2 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h
@@ -7,6 +7,7 @@
#import <Cocoa/Cocoa.h>
+#include "base/mac/objc_property_releaser.h"
#import "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h"
@@ -126,20 +127,22 @@ class ZoomLevelObserver;
MenuTrackedRootView* toolbarActionsOverflowItem_;
BrowserActionsContainerView* overflowActionsContainerView_;
+
+ base::mac::ObjCPropertyReleaser propertyReleaser_;
}
-@property(assign, nonatomic) IBOutlet MenuTrackedRootView* editItem;
-@property(assign, nonatomic) IBOutlet NSButton* editCut;
-@property(assign, nonatomic) IBOutlet NSButton* editCopy;
-@property(assign, nonatomic) IBOutlet NSButton* editPaste;
-@property(assign, nonatomic) IBOutlet MenuTrackedRootView* zoomItem;
-@property(assign, nonatomic) IBOutlet NSButton* zoomPlus;
-@property(assign, nonatomic) IBOutlet NSButton* zoomDisplay;
-@property(assign, nonatomic) IBOutlet NSButton* zoomMinus;
-@property(assign, nonatomic) IBOutlet NSButton* zoomFullScreen;
-@property(assign, nonatomic)
+@property(retain, nonatomic) IBOutlet MenuTrackedRootView* editItem;
+@property(retain, nonatomic) IBOutlet NSButton* editCut;
+@property(retain, nonatomic) IBOutlet NSButton* editCopy;
+@property(retain, nonatomic) IBOutlet NSButton* editPaste;
+@property(retain, nonatomic) IBOutlet MenuTrackedRootView* zoomItem;
+@property(retain, nonatomic) IBOutlet NSButton* zoomPlus;
+@property(retain, nonatomic) IBOutlet NSButton* zoomDisplay;
+@property(retain, nonatomic) IBOutlet NSButton* zoomMinus;
+@property(retain, nonatomic) IBOutlet NSButton* zoomFullScreen;
+@property(retain, nonatomic)
IBOutlet MenuTrackedRootView* toolbarActionsOverflowItem;
-@property(assign, nonatomic)
+@property(retain, nonatomic)
IBOutlet BrowserActionsContainerView* overflowActionsContainerView;
- (id)initWithController:(WrenchMenuController*)controller;

Powered by Google App Engine
This is Rietveld 408576698