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

Unified Diff: ios/chrome/browser/ui/fullscreen_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 side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/fullscreen_controller.mm
diff --git a/ios/chrome/browser/ui/fullscreen_controller.mm b/ios/chrome/browser/ui/fullscreen_controller.mm
index f964931605757e58fe6a174eb030f35243f137b4..a71d49e0210ba0dae9069dcf9bac303d4a978ee2 100644
--- a/ios/chrome/browser/ui/fullscreen_controller.mm
+++ b/ios/chrome/browser/ui/fullscreen_controller.mm
@@ -7,7 +7,7 @@
#include <cmath>
#include "base/logging.h"
-#include "base/mac/objc_property_releaser.h"
+#include "base/mac/objc_release_properties.h"
#import "ios/chrome/browser/ui/browser_view_controller.h"
#import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
#import "ios/chrome/browser/ui/tabs/tab_strip_controller.h"
@@ -68,16 +68,14 @@ BOOL CGFloatEquals(CGFloat a, CGFloat b) {
uint fullScreenLock_;
// CRWWebViewProxy object allows web view manipulations.
base::scoped_nsprotocol<id<CRWWebViewProxy>> webViewProxy_;
- base::mac::ObjCPropertyReleaser propertyReleaser_FullScreenController_;
}
// Access to the UIWebView's UIScrollView.
@property(nonatomic, readonly) CRWWebViewScrollViewProxy* scrollViewProxy;
// The navigation controller of the page.
@property(nonatomic, readonly, assign) NavigationManager* navigationManager;
-// The gesture recognizer set on the scrollview to detect tap. Must be readwrite
-// for property releaser to work.
-@property(nonatomic, readwrite, retain)
+// The gesture recognizer set on the scrollview to detect tap.
+@property(nonatomic, readonly, retain)
UITapGestureRecognizer* userInteractionGestureRecognizer;
// The delegate responsible for providing the header height and moving the
// header.
@@ -193,14 +191,10 @@ BOOL CGFloatEquals(CGFloat a, CGFloat b) {
navigationManager:(NavigationManager*)navigationManager
sessionID:(NSString*)sessionID {
if (!gEnabledForTests) {
- propertyReleaser_FullScreenController_.Init(self,
- [FullScreenController class]);
[self release];
return nil;
}
if ((self = [super init])) {
- propertyReleaser_FullScreenController_.Init(self,
- [FullScreenController class]);
DCHECK(sessionID);
DCHECK(delegate);
delegate_ = delegate;
@@ -318,6 +312,7 @@ BOOL CGFloatEquals(CGFloat a, CGFloat b) {
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
+ base::mac::ReleaseProperties(self);
[super dealloc];
}

Powered by Google App Engine
This is Rietveld 408576698