Autofill OSX: Draw red outline around incorrect CVC input.

chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
 #include "chrome/browser/ui/chrome_style.h"
+#import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller.h"
 #include "chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 100 matching lines @@
 #pragma mark CardUnmaskPromptViewCocoa
 
 @implementation CardUnmaskPromptViewCocoa {
   base::scoped_nsobject<NSBox> permanentErrorBox_;
   base::scoped_nsobject<NSView> inputRowView_;
   base::scoped_nsobject<NSView> storageView_;
 
   base::scoped_nsobject<NSTextField> titleLabel_;
   base::scoped_nsobject<NSTextField> permanentErrorLabel_;
   base::scoped_nsobject<NSTextField> instructionsLabel_;
-  base::scoped_nsobject<NSTextField> cvcInput_;
+  base::scoped_nsobject<AutofillTextField> cvcInput_;
   base::scoped_nsobject<NSPopUpButton> monthPopup_;
   base::scoped_nsobject<NSPopUpButton> yearPopup_;
   base::scoped_nsobject<NSButton> cancelButton_;
   base::scoped_nsobject<NSButton> verifyButton_;
   base::scoped_nsobject<NSButton> storageCheckbox_;
   base::scoped_nsobject<AutofillTooltipController> storageTooltip_;
   base::scoped_nsobject<NSTextField> errorLabel_;
   base::scoped_nsobject<NSTextField> progressOverlayLabel_;
 
   int monthPopupDefaultIndex_;
@@ skipping 63 matching lines @@
   [yearPopup_ setEnabled:enabled];
   [storageCheckbox_ setEnabled:enabled];
 }
 
 - (void)setRetriableErrorMessage:(const base::string16&)text {
   NSAttributedString* attributedString =
       constrained_window::GetAttributedLabelString(
           SysUTF16ToNSString(text), kErrorFontStyle, NSNaturalTextAlignment,
           NSLineBreakByWordWrapping);
   [errorLabel_ setAttributedStringValue:attributedString];
+
+  // If there is more than one input showing, don't mark anything as
+  // invalid since we don't know the location of the problem.
+  if (!text.empty() && !bridge_->GetController()->ShouldRequestExpirationDate())
+    [cvcInput_ setValidityMessage:@"invalid"];

[bondd, 2015/04/01 18:13:14]

AutofillTextField only checks this string for length == 0 so it can be anything.

[groby-ooo-7-16, 2015/04/02 22:32:56]

I know :)

Check if this is used as a hover message, though.

+
   [self performLayoutAndDisplay:YES];
 }
 
 - (void)setPermanentErrorMessage:(const base::string16&)text {
   if (!text.empty()) {
     if (!permanentErrorBox_) {
       permanentErrorBox_.reset([[NSBox alloc] initWithFrame:NSZeroRect]);
       [permanentErrorBox_ setBoxType:NSBoxCustom];
       [permanentErrorBox_ setBorderType:NSNoBorder];
       [permanentErrorBox_ setTitlePosition:NSNoTitle];
@@ skipping 61 matching lines @@
     [self setRetriableErrorMessage:
               l10n_util::GetStringUTF16(
                   IDS_AUTOFILL_CARD_UNMASK_INVALID_EXPIRATION_DATE)];
   }
 
   [self updateVerifyButtonEnabled];
 }
 
 // Called when text in CVC input field changes.
 - (void)controlTextDidChange:(NSNotification*)notification {
+  if (bridge_->GetController()->InputCvcIsValid(
+          base::SysNSStringToUTF16([cvcInput_ stringValue])))
+    [cvcInput_ setValidityMessage:@""];
+
   [self updateVerifyButtonEnabled];
 }
 
 - (base::scoped_nsobject<NSView>)createStorageViewWithController:
         (autofill::CardUnmaskPromptController*)controller {
   base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
 
   // Add "Store card on this device" checkbox.
   storageCheckbox_.reset([[NSButton alloc] initWithFrame:NSZeroRect]);
   [storageCheckbox_ setButtonType:NSSwitchButton];
@@ skipping 182 matching lines @@
         setFrameOrigin:NSMakePoint(NSMaxX([monthPopup_ frame]) + kButtonGap,
                                    0)];
     NSRect expirationFrame =
         NSUnionRect([monthPopup_ frame], [yearPopup_ frame]);
     expirationFrame.size.width += kButtonGap;
     [expirationView setFrame:expirationFrame];
     [inputRowView_ addSubview:expirationView];
   }
 
   // Add CVC text input.
-  cvcInput_.reset([[NSTextField alloc] initWithFrame:NSZeroRect]);
+  cvcInput_.reset([[AutofillTextField alloc] initWithFrame:NSZeroRect]);
   [[cvcInput_ cell]
       setPlaceholderString:l10n_util::GetNSString(
                                IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC)];
   [[cvcInput_ cell] setScrollable:YES];
   [cvcInput_ setDelegate:self];
   [cvcInput_ sizeToFit];
   [cvcInput_ setFrame:NSMakeRect(NSMaxX([expirationView frame]), 0,
                                  kCvcInputWidth, NSHeight([cvcInput_ frame]))];
   [inputRowView_ addSubview:cvcInput_];
 
@@ skipping 39 matching lines @@
 
   // Layout inputRowView_.
   [CardUnmaskPromptViewCocoa sizeToFitView:inputRowView_];
   [CardUnmaskPromptViewCocoa verticallyCenterSubviewsInView:inputRowView_];
 
   [self setView:mainView];
   [self performLayoutAndDisplay:NO];
 }
 
 @end