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

Unified Diff: ios/chrome/browser/ui/settings/autofill_credit_card_edit_collection_view_controller.mm

Issue 2815513008: [ObjC ARC] Converts ios/chrome/browser/ui/settings:settings_arc to ARC. (Closed)
Patch Set: Removes accidental retain from another CL Created 3 years, 8 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/settings/autofill_credit_card_edit_collection_view_controller.mm
diff --git a/ios/chrome/browser/ui/settings/autofill_credit_card_edit_collection_view_controller.mm b/ios/chrome/browser/ui/settings/autofill_credit_card_edit_collection_view_controller.mm
index f17c319e6f87f43b13ba0d2116498008a024a76a..ce984d06bb2498b5b961b7d6660f9d53dddb8501 100644
--- a/ios/chrome/browser/ui/settings/autofill_credit_card_edit_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/autofill_credit_card_edit_collection_view_controller.mm
@@ -6,10 +6,8 @@
#include "base/format_macros.h"
#import "base/ios/block_types.h"
-#import "base/ios/weak_nsobject.h"
#import "base/mac/foundation_util.h"
#include "base/mac/scoped_block.h"
-#import "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "components/autofill/core/browser/autofill_data_util.h"
#include "components/autofill/core/browser/credit_card.h"
@@ -31,9 +29,14 @@
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h"
+#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
using ::AutofillTypeFromAutofillUIType;
@@ -89,8 +92,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
if (_creditCard.record_type() == autofill::CreditCard::FULL_SERVER_CARD ||
_creditCard.record_type() == autofill::CreditCard::MASKED_SERVER_CARD) {
GURL paymentsURL = autofill::payments::GetManageInstrumentsUrl(0);
- base::scoped_nsobject<OpenUrlCommand> command(
- [[OpenUrlCommand alloc] initWithURLFromChrome:paymentsURL]);
+ OpenUrlCommand* command =
+ [[OpenUrlCommand alloc] initWithURLFromChrome:paymentsURL];
[command setTag:IDC_CLOSE_SETTINGS_AND_OPEN_URL];
[self chromeExecuteCommand:command];
@@ -141,8 +144,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
BOOL isEditing = self.editor.editing;
[model addSectionWithIdentifier:SectionIdentifierFields];
- AutofillEditItem* cardholderNameitem = [[[AutofillEditItem alloc]
- initWithType:ItemTypeCardholderName] autorelease];
+ AutofillEditItem* cardholderNameitem =
+ [[AutofillEditItem alloc] initWithType:ItemTypeCardholderName];
cardholderNameitem.textFieldName =
l10n_util::GetNSString(IDS_IOS_AUTOFILL_CARDHOLDER);
cardholderNameitem.textFieldValue = autofill::GetCreditCardName(
@@ -154,7 +157,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
// Card number (PAN).
AutofillEditItem* cardNumberitem =
- [[[AutofillEditItem alloc] initWithType:ItemTypeCardNumber] autorelease];
+ [[AutofillEditItem alloc] initWithType:ItemTypeCardNumber];
cardNumberitem.textFieldName =
l10n_util::GetNSString(IDS_IOS_AUTOFILL_CARD_NUMBER);
// Never show full card number for Wallet cards, even if copied locally.
@@ -170,8 +173,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
toSectionWithIdentifier:SectionIdentifierFields];
// Expiration month.
- AutofillEditItem* expirationMonthItem = [[[AutofillEditItem alloc]
- initWithType:ItemTypeExpirationMonth] autorelease];
+ AutofillEditItem* expirationMonthItem =
+ [[AutofillEditItem alloc] initWithType:ItemTypeExpirationMonth];
expirationMonthItem.textFieldName =
l10n_util::GetNSString(IDS_IOS_AUTOFILL_EXP_MONTH);
expirationMonthItem.textFieldValue =
@@ -182,8 +185,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
toSectionWithIdentifier:SectionIdentifierFields];
// Expiration year.
- AutofillEditItem* expirationYearItem = [[[AutofillEditItem alloc]
- initWithType:ItemTypeExpirationYear] autorelease];
+ AutofillEditItem* expirationYearItem =
+ [[AutofillEditItem alloc] initWithType:ItemTypeExpirationYear];
expirationYearItem.textFieldName =
l10n_util::GetNSString(IDS_IOS_AUTOFILL_EXP_YEAR);
expirationYearItem.textFieldValue =
@@ -196,8 +199,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
if (_creditCard.record_type() == autofill::CreditCard::FULL_SERVER_CARD) {
// Add CopiedToChrome cell in its own section.
[model addSectionWithIdentifier:SectionIdentifierCopiedToChrome];
- CopiedToChromeItem* copiedToChromeItem = [[[CopiedToChromeItem alloc]
- initWithType:ItemTypeCopiedToChrome] autorelease];
+ CopiedToChromeItem* copiedToChromeItem =
+ [[CopiedToChromeItem alloc] initWithType:ItemTypeCopiedToChrome];
[model addItem:copiedToChromeItem
toSectionWithIdentifier:SectionIdentifierCopiedToChrome];
}

Powered by Google App Engine
This is Rietveld 408576698