[rAC, OSX] Add overlay shield for interstitials/waits.

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

 // Copyright (c) 2013 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 "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h"
 
 #include "base/bind.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_account_chooser.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_details_container.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_main_container.h"
+#import "chrome/browser/ui/cocoa/autofill/autofill_overlay_controller.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.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"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 26 matching lines @@
   // This should only be called once.
   DCHECK(!sheet_delegate_.get());
   sheet_delegate_.reset([[AutofillDialogWindowController alloc]
        initWithWebContents:delegate_->GetWebContents()
             autofillDialog:this]);
   base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
       [[CustomConstrainedWindowSheet alloc]
           initWithCustomWindow:[sheet_delegate_ window]]);
   constrained_window_.reset(
       new ConstrainedWindowMac(this, delegate_->GetWebContents(), sheet));
+  [sheet_delegate_ show];
 }
 
 void AutofillDialogCocoa::Hide() {
   [sheet_delegate_ hide];
 }
 
 void AutofillDialogCocoa::PerformClose() {
   if (!close_weak_ptr_factory_.HasWeakPtrs()) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
@@ skipping 12 matching lines @@
 
 void AutofillDialogCocoa::UpdatesFinished() {
   // TODO(estade): implement if it makes sense to.
 }
 
 void AutofillDialogCocoa::UpdateAccountChooser() {
   [sheet_delegate_ updateAccountChooser];
 }
 
 void AutofillDialogCocoa::UpdateButtonStrip() {
+  [sheet_delegate_ updateButtonStrip];
 }
 
 void AutofillDialogCocoa::UpdateDetailArea() {
 }
 
 void AutofillDialogCocoa::UpdateForErrors() {
 }
 
 void AutofillDialogCocoa::UpdateNotificationArea() {
   [sheet_delegate_ updateNotificationArea];
@@ skipping 170 matching lines @@
     [loadingShieldTextField_ setFont:loadingFont];
     [loadingShieldTextField_ setEditable:NO];
     [loadingShieldTextField_ setBordered:NO];
     [loadingShieldTextField_ setDrawsBackground:NO];
 
     base::scoped_nsobject<AutofillOpaqueView> loadingShieldView(
         [[AutofillOpaqueView alloc] initWithFrame:NSZeroRect]);
     [loadingShieldView setHidden:YES];
     [loadingShieldView addSubview:loadingShieldTextField_];
 
+    overlayController_.reset([[AutofillOverlayController alloc] init]);
+    [[overlayController_ view] setHidden:YES];
+
     // This needs a flipped content view because otherwise the size
     // animation looks odd. However, replacing the contentView for constrained
     // windows does not work - it does custom rendering.
     base::scoped_nsobject<NSView> flippedContentView(
         [[FlippedView alloc] initWithFrame:NSZeroRect]);
     [flippedContentView setSubviews:
         @[accountChooser_,
           [mainContainer_ view],
           [signInContainer_ view],
-          loadingShieldView]];
+          loadingShieldView,
+          [overlayController_ view]]];
     [flippedContentView setAutoresizingMask:
         (NSViewWidthSizable | NSViewHeightSizable)];
     [[[self window] contentView] addSubview:flippedContentView];
     [mainContainer_ setAnchorView:[[accountChooser_ subviews] objectAtIndex:1]];
 
     NSRect contentRect = clientRect;
     contentRect.origin = NSZeroPoint;
     contentRect.size.width += 2 * chrome_style::kHorizontalPadding;
     contentRect.size.height += NSHeight(headerRect) +
                                chrome_style::kClientBottomPadding +
                                chrome_style::kTitleTopPadding;
-    [self performLayout];
-
-    // Resizing the browser causes the ConstrainedWindow to move.
-    // Observe that to allow resizes based on browser size.
-    NSView* contentView = [[self window] contentView];
-    [contentView setPostsFrameChangedNotifications:YES];
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-           selector:@selector(onContentViewFrameDidChange:)
-               name:NSWindowDidMoveNotification
-             object:[self window]];
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (void)onContentViewFrameDidChange:(NSNotification*)notification {
@@ skipping 21 matching lines @@
   // Show as much of the main view as is possible without going past the
   // bottom of the browser window.
   NSRect dialogFrameRect = [[self window] frame];
   NSRect browserFrameRect =
       [webContents_->GetView()->GetTopLevelNativeWindow() frame];
   dialogFrameRect.size.height =
       NSMaxY(dialogFrameRect) - NSMinY(browserFrameRect);
   dialogFrameRect = [[self window] contentRectForFrameRect:dialogFrameRect];
   size.height = std::min(NSHeight(dialogFrameRect), size.height);
 
+  if (![[overlayController_ view] isHidden]) {
+    int height = [overlayController_ getHeightForWidth:size.width];
+    // TODO(groby): This currently reserves size on top of the overlay image
+    // equivalent to the height of the header. Clarify with UX what the final
+    // padding will be.
+    if (height != 0) {
+      size.height = height + headerSize.height + kDetailTopPadding;
+    }
+  }
+
   return size;
 }
 
 - (void)performLayout {
   NSRect contentRect = NSZeroRect;
   contentRect.size = [self preferredSize];
   NSRect clientRect = NSInsetRect(
       contentRect, chrome_style::kHorizontalPadding, 0);
   clientRect.origin.y = chrome_style::kClientBottomPadding;
   clientRect.size.height -= chrome_style::kTitleTopPadding +
@@ skipping 15 matching lines @@
 
   // Loading shield has text centered in the content rect.
   NSRect textFrame = [loadingShieldTextField_ frame];
   textFrame.origin.x =
       std::ceil((NSWidth(contentRect) - NSWidth(textFrame)) / 2.0);
   textFrame.origin.y =
     std::ceil((NSHeight(contentRect) - NSHeight(textFrame)) / 2.0);
   [loadingShieldTextField_ setFrame:textFrame];
   [[loadingShieldTextField_ superview] setFrame:contentRect];
 
+  [[overlayController_ view] setFrame:contentRect];
+  [overlayController_ performLayout];
+
   NSRect frameRect = [[self window] frameRectForContentRect:contentRect];
   [[self window] setFrame:frameRect display:YES];
 }
 
 - (IBAction)accept:(id)sender {
   if ([mainContainer_ validate])
     autofillDialog_->delegate()->OnAccept();
 }
 
 - (IBAction)cancel:(id)sender {
   autofillDialog_->delegate()->OnCancel();
   autofillDialog_->PerformClose();
 }
 
+- (void)show {
+  gfx::Image splashImage = autofillDialog_->delegate()->SplashPageImage();
+  if (!splashImage.IsEmpty()) {
+    autofill::DialogOverlayState state;
+    state.image = splashImage;
+    [overlayController_ setState:state];
+    [overlayController_ beginFadeOut];
+  }
+
+  // Resizing the browser causes the ConstrainedWindow to move.
+  // Observe that to allow resizes based on browser size.
+  // NOTE: This MUST come last after all initial setup is done, because there
+  // is an immediate notification post registration.
+  NSView* contentView = [[self window] contentView];
+  [contentView setPostsFrameChangedNotifications:YES];
+  [[NSNotificationCenter defaultCenter]
+      addObserver:self
+         selector:@selector(onContentViewFrameDidChange:)
+             name:NSWindowDidMoveNotification
+           object:[self window]];
+
+  [self requestRelayout];
+}
+
 - (void)hide {
   autofillDialog_->delegate()->OnCancel();
   autofillDialog_->PerformClose();
 }
 
 - (void)updateNotificationArea {
   [mainContainer_ updateNotificationArea];
 }
 
 - (void)updateAccountChooser {
   [accountChooser_ update];
   [mainContainer_ updateLegalDocuments];
   // TODO(estade): replace this with a better loading image/animation.
   // See http://crbug.com/230932
   NSString* newLoadingMessage = @"";
   if (autofillDialog_->delegate()->ShouldShowSpinner())
     newLoadingMessage = l10n_util::GetNSStringWithFixup(IDS_TAB_LOADING_TITLE);
   if (![newLoadingMessage isEqualToString:
        [loadingShieldTextField_ stringValue]]) {
     [loadingShieldTextField_ setStringValue:newLoadingMessage];
     [loadingShieldTextField_ sizeToFit];
     [[loadingShieldTextField_ superview] setHidden:
         [newLoadingMessage length] == 0];
     [self requestRelayout];
   }
 }
 
+- (void)updateButtonStrip {
+  [overlayController_ setState:
+      autofillDialog_->delegate()->GetDialogOverlay()];
+}
+
 - (void)updateSection:(autofill::DialogSection)section {
   [[mainContainer_ sectionForId:section] update];
 }
 
 - (void)fillSection:(autofill::DialogSection)section
            forInput:(const autofill::DetailInput&)input {
   [[mainContainer_ sectionForId:section] fillForInput:input];
 }
 
 - (content::NavigationController*)showSignIn {
@@ skipping 44 matching lines @@
 }
 
 - (void)activateFieldForInput:(const autofill::DetailInput&)input {
   for (size_t i = autofill::SECTION_MIN; i <= autofill::SECTION_MAX; ++i) {
     autofill::DialogSection section = static_cast<autofill::DialogSection>(i);
     [[mainContainer_ sectionForId:section] activateFieldForInput:input];
   }
 }
 
 @end