Index: chrome/browser/autofill/autofill_credit_card_model_mac.mm |
diff --git a/chrome/browser/autofill/autofill_credit_card_model_mac.mm b/chrome/browser/autofill/autofill_credit_card_model_mac.mm |
index c75e14face95b35a67fcc5ffb6c3ef3312d68a8b..f75bd05efd6253e33c7db2effbcb86e21f520fde 100644 |
--- a/chrome/browser/autofill/autofill_credit_card_model_mac.mm |
+++ b/chrome/browser/autofill/autofill_credit_card_model_mac.mm |
@@ -11,7 +11,6 @@ |
@implementation AutoFillCreditCardModel |
-@dynamic summary; |
@synthesize label = label_; |
@synthesize nameOnCard = nameOnCard_; |
@synthesize creditCardNumber = creditCardNumber_; |
@@ -19,19 +18,6 @@ |
@synthesize expirationYear = expirationYear_; |
@synthesize cvcCode = cvcCode_; |
@synthesize billingAddress = billingAddress_; |
-@synthesize shippingAddress = shippingAddress_; |
- |
-// Sets up the KVO dependency between "summary" and dependent fields. |
-+ (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key { |
- NSSet* keyPaths = [super keyPathsForValuesAffectingValueForKey:key]; |
- |
- if ([key isEqualToString:@"summary"]) { |
- NSSet* affectingKeys = [NSSet setWithObjects:@"creditCardNumber", |
- @"expirationMonth", @"expirationYear", nil]; |
- keyPaths = [keyPaths setByAddingObjectsFromSet:affectingKeys]; |
- } |
- return keyPaths; |
-} |
- (id)initWithCreditCard:(const CreditCard&)creditCard { |
if ((self = [super init])) { |
@@ -48,8 +34,6 @@ |
creditCard.GetFieldText(AutoFillType(CREDIT_CARD_VERIFICATION_CODE)))]; |
[self setBillingAddress:SysUTF16ToNSString( |
creditCard.billing_address())]; |
- [self setShippingAddress:SysUTF16ToNSString( |
- creditCard.shipping_address())]; |
} |
return self; |
} |
@@ -62,17 +46,9 @@ |
[expirationYear_ release]; |
[cvcCode_ release]; |
[billingAddress_ release]; |
- [shippingAddress_ release]; |
[super dealloc]; |
} |
-- (NSString*)summary { |
- // Create a temporary |creditCard| to generate summary string. |
- CreditCard creditCard(string16(), 0); |
- [self copyModelToCreditCard:&creditCard]; |
- return SysUTF16ToNSString(creditCard.PreviewSummary()); |
-} |
- |
- (void)copyModelToCreditCard:(CreditCard*)creditCard { |
DCHECK(creditCard); |
creditCard->set_label(base::SysNSStringToUTF16([self label])); |
@@ -88,8 +64,6 @@ |
base::SysNSStringToUTF16([self cvcCode])); |
creditCard->set_billing_address( |
base::SysNSStringToUTF16([self billingAddress])); |
- creditCard->set_shipping_address( |
- base::SysNSStringToUTF16([self shippingAddress])); |
} |
@end |