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

Unified Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2610923005: Replace ObjCPropertyReleaser with ReleaseProperties() project-wide. (Closed)
Patch Set: Yank unrelated changes. Created 3 years, 10 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/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index b23e6dd1a5aa86ac7963362d70368ebe73e8ca4c..773090b5b670a8b8005d120dd4944e1e9cb8f4b9 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -26,7 +26,7 @@
#include "base/mac/bind_objc_block.h"
#include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h"
-#include "base/mac/objc_property_releaser.h"
+#include "base/mac/objc_release_properties.h"
#import "base/mac/scoped_block.h"
#import "base/mac/scoped_nsobject.h"
#include "base/macros.h"
@@ -495,9 +495,6 @@ FindInPageController* GetFindInPageController(Tab* tab) {
// Coordinator for displaying alerts.
base::scoped_nsobject<AlertCoordinator> _alertCoordinator;
-
- // Releaser for properties that aren't backed by scoped_nsobjects.
- base::mac::ObjCPropertyReleaser _propertyReleaser_BrowserViewController;
}
// The browser's side swipe controller. Lazily instantiated on the first call.
@@ -904,8 +901,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
self = [super initWithNibName:nil bundle:base::mac::FrameworkBundle()];
if (self) {
DCHECK(factory);
- _propertyReleaser_BrowserViewController.Init(self,
- [BrowserViewController class]);
_dependencyFactory.reset([factory retain]);
_nativeControllersForTabIDs.reset(
[[NSMapTable strongToWeakObjectsMapTable] retain]);
@@ -952,6 +947,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {
_voiceSearchController->SetDelegate(nil);
[_rateThisAppDialog setDelegate:nil];
[_model closeAllTabs];
+ base::mac::ReleaseProperties(self);
[super dealloc];
}

Powered by Google App Engine
This is Rietveld 408576698