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

Unified Diff: ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.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/omnibox/omnibox_text_field_ios.mm
diff --git a/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm b/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
index f95f24fed48ca37c2d3efcc69804b7a632a5e02b..0411e22111b4c0b15ae91caba53c6bd7fc2637a5 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
@@ -10,7 +10,7 @@
#include "base/ios/ios_util.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
-#include "base/mac/objc_property_releaser.h"
+#include "base/mac/objc_release_properties.h"
#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "components/grit/components_scaled_resources.h"
@@ -96,18 +96,13 @@ NSString* const kOmniboxFadeAnimationKey = @"OmniboxFadeAnimation";
base::scoped_nsobject<NSString> _chipText;
base::scoped_nsobject<UILabel> _selection;
base::scoped_nsobject<UILabel> _preEditStaticLabel;
- NSString* _preEditText;
base::scoped_nsobject<UIFont> _font;
base::scoped_nsobject<UIColor> _displayedTextColor;
base::scoped_nsobject<UIColor> _displayedTintColor;
- UIColor* _selectedTextBackgroundColor;
- UIColor* _placeholderTextColor;
// The 'Copy URL' menu item is sometimes shown in the edit menu, so keep it
// around to make adding/removing easier.
base::scoped_nsobject<UIMenuItem> _copyUrlMenuItem;
-
- base::mac::ObjCPropertyReleaser _propertyReleaser_OmniboxTextFieldIOS;
}
@synthesize leftViewImageId = _leftViewImageId;
@@ -131,8 +126,6 @@ NSString* const kOmniboxFadeAnimationKey = @"OmniboxFadeAnimation";
tintColor:(UIColor*)tintColor {
self = [super initWithFrame:frame];
if (self) {
- _propertyReleaser_OmniboxTextFieldIOS.Init(self,
- [OmniboxTextFieldIOS class]);
_font.reset([font retain]);
_displayedTextColor.reset([textColor retain]);
if (tintColor) {
@@ -164,6 +157,11 @@ NSString* const kOmniboxFadeAnimationKey = @"OmniboxFadeAnimation";
return self;
}
+- (void)dealloc {
+ base::mac::ReleaseProperties(self);
+ [super dealloc];
+}
+
- (instancetype)initWithCoder:(nonnull NSCoder*)aDecoder {
NOTREACHED();
return nil;

Powered by Google App Engine
This is Rietveld 408576698