Autofill OSX: Do not show storage footer when !CanStoreLocally().

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"
@@ skipping 244 matching lines @@
                 [self expirationDateIsValid];
 
   [verifyButton_ setEnabled:enable];
 }
 
 - (void)onVerify:(id)sender {
   bridge_->GetController()->OnUnmaskResponse(
       base::SysNSStringToUTF16([cvcInput_ stringValue]),
       base::SysNSStringToUTF16([monthPopup_ titleOfSelectedItem]),
       base::SysNSStringToUTF16([yearPopup_ titleOfSelectedItem]),
       [storageCheckbox_ state] == NSOnState);

[bondd, 2015/03/27 00:20:52]

storageCheckbox_ can be nil. Apple docs indicate that NSOnState can be assumed
to be non-zero, so this line works as is.
Alternatively:
storageCheckbox_ ? [storageCheckbox_ state] == NSOnState : false

[groby-ooo-7-16, 2015/03/27 00:53:17]

sgtm

 }
 
 - (void)onCancel:(id)sender {
   bridge_->PerformClose();
 }
 
 - (BOOL)expirationDateIsValid {
   if (!bridge_->GetController()->ShouldRequestExpirationDate())
     return true;
 
@@ skipping 47 matching lines @@
                      IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_TOOLTIP))];
   [view addSubview:[storageTooltip_ view]];
   [[storageTooltip_ view] setFrameOrigin:
       NSMakePoint(NSMaxX([storageCheckbox_ frame]) + kButtonGap, 0)];
 
   [CardUnmaskPromptViewCocoa sizeToFitView:view];
   [CardUnmaskPromptViewCocoa verticallyCenterSubviewsInView:view];
   return view;
 }
 
-// +------------------------------------------------+
-// | titleLabel_        (Single line.)              |
-// |------------------------------------------------|
-// | permanentErrorBox_ (Multiline, may be hidden.) |
-// |------------------------------------------------|
-// | instructionsLabel_ (Multiline.)                |
-// |------------------------------------------------|
-// | monthPopup_ yearPopup_ cvcInput_ cvcImage      |
-// |     (All enclosed in inputRowView_. Month and  |
-// |         year may be hidden.)                   |
-// |------------------------------------------------|
-// | errorLabel_ (Multiline. Always takes up space  |
-// |                 for one line even if empty.)   |
-// |------------------------------------------------|
-// |                              [Cancel] [Verify] |
-// |------------------------------------------------|
-// | storageCheckbox_ storageTooltip_               |
-// |     (Both enclosed in storageView_.)           |
-// +------------------------------------------------+
+// +---------------------------------------------------------------------------+
+// | titleLabel_        (Single line.)                                         |
+// |---------------------------------------------------------------------------|
+// | permanentErrorBox_ (Multiline, may be hidden.)                            |
+// |---------------------------------------------------------------------------|
+// | instructionsLabel_ (Multiline.)                                           |
+// |---------------------------------------------------------------------------|
+// | monthPopup_ yearPopup_ cvcInput_ cvcImage                                 |
+// |     (All enclosed in inputRowView_. Month and year may be hidden.)        |
+// |---------------------------------------------------------------------------|
+// | errorLabel_ (Multiline. Always takes up space for one line even if        |
+// |                 empty.)                                                   |
+// |---------------------------------------------------------------------------|
+// |                                                         [Cancel] [Verify] |
+// |---------------------------------------------------------------------------|
+// | storageCheckbox_ storageTooltip_                                          |
+// |     (Both enclosed in storageView_. May be hidden but still taking up     |
+// |         layout space. Will all be nil if !CanStoreLocally()).             |
+// +---------------------------------------------------------------------------+
 - (void)performLayoutAndDisplay:(BOOL)display {
   // Calculate dialog content width.
   CGFloat contentWidth =
       std::max(NSWidth([titleLabel_ frame]), NSWidth([inputRowView_ frame]));
   contentWidth = std::max(contentWidth, NSWidth([storageView_ frame]));
   contentWidth = std::max(contentWidth, kDialogContentMinWidth);
 
   [storageView_
       setFrameOrigin:NSMakePoint(0, chrome_style::kClientBottomPadding)];
 
+  CGFloat verifyMinY =
+      storageView_ ? NSMaxY([storageView_ frame]) + chrome_style::kRowPadding
+                   : chrome_style::kClientBottomPadding;
   [verifyButton_ setFrameOrigin:
-      NSMakePoint(contentWidth - NSWidth([verifyButton_ frame]),
-                  NSMaxY([storageView_ frame]) + chrome_style::kRowPadding)];
+      NSMakePoint(contentWidth - NSWidth([verifyButton_ frame]), verifyMinY)];
 
   [cancelButton_
       setFrameOrigin:NSMakePoint(NSMinX([verifyButton_ frame]) - kButtonGap -
                                      NSWidth([cancelButton_ frame]),
                                  NSMinY([verifyButton_ frame]))];
 
   [errorLabel_ setFrame:NSMakeRect(0, NSMaxY([cancelButton_ frame]) +
                                           chrome_style::kRowPadding,
                                    contentWidth, 0)];
   cocoa_l10n_util::WrapOrSizeToFit(errorLabel_);
@@ skipping 46 matching lines @@
       [[NSBox alloc] initWithFrame:NSZeroRect]);
   [mainView setBoxType:NSBoxCustom];
   [mainView setBorderType:NSNoBorder];
   [mainView setTitlePosition:NSNoTitle];
   [mainView
       setContentViewMargins:NSMakeSize(chrome_style::kHorizontalPadding, 0)];
 
   inputRowView_.reset([[NSView alloc] initWithFrame:NSZeroRect]);
   [mainView addSubview:inputRowView_];
 
-  storageView_ = [self createStorageViewWithController:controller];
-  [mainView addSubview:storageView_];
+  if (controller->CanStoreLocally()) {

[bondd, 2015/03/27 00:20:52]

CanStoreLocally() check can either go here, or at the top of
-createStorageViewWithController: and return empty scoped_nsobject. I prefer it
here because then -createStorageViewWithController: always does what it says
it's going to do.

[groby-ooo-7-16, 2015/03/27 00:53:17]

sgtm

+    storageView_ = [self createStorageViewWithController:controller];

[groby-ooo-7-16, 2015/03/27 00:53:17]

storageView_.reset()?

[bondd, 2015/03/27 01:09:38]

Sorry, could you please clarify what you mean here? Call storageView_.reset()
when !CanStoreLocally()? Something else?

[groby-ooo-7-16, 2015/03/27 01:36:07]

I assumed createStorage... returns a pointer, and suggested reset. Just saw that
it returns a scoped_nsobject, so please ignore

+    [mainView addSubview:storageView_];
+  }
 
   progressOverlayLabel_.reset([constrained_window::CreateLabel() retain]);
   [progressOverlayLabel_ setHidden:YES];
   [mainView addSubview:progressOverlayLabel_];
 
   // Add title label.
   titleLabel_.reset([constrained_window::CreateLabel() retain]);
   NSAttributedString* titleString =
       constrained_window::GetAttributedLabelString(
           SysUTF16ToNSString(controller->GetWindowTitle()),
@@ skipping 101 matching lines @@
 
   // Layout inputRowView_.
   [CardUnmaskPromptViewCocoa sizeToFitView:inputRowView_];
   [CardUnmaskPromptViewCocoa verticallyCenterSubviewsInView:inputRowView_];
 
   [self setView:mainView];
   [self performLayoutAndDisplay:NO];
 }
 
 @end