[rAc OSX] Animate the dots in the "Loading ..." message.

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/foundation_util.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"
 #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_input_field.h"
+#import "chrome/browser/ui/cocoa/autofill/autofill_loading_shield_controller.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/autofill/autofill_textfield.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"
@@ skipping 197 matching lines @@
 
 void AutofillDialogCocoa::OnConstrainedWindowClosed(
     ConstrainedWindowMac* window) {
   constrained_window_.reset();
   // |this| belongs to |delegate_|, so no self-destruction here.
   delegate_->ViewClosed();
 }
 
 }  // autofill
 
-#pragma mark "Loading" Shield
-
-@interface AutofillOpaqueView : NSView
-@end
-
-@implementation AutofillOpaqueView
-
-- (BOOL)isOpaque {
-  return YES;
-}
-
-- (void)drawRect:(NSRect)dirtyRect {
-  [[[self window] backgroundColor] setFill];
-  [NSBezierPath fillRect:[self bounds]];
-}
-
-@end
-
-
 #pragma mark Field Editor
 
 @interface AutofillDialogFieldEditor : NSTextView
 @end
 
 
 @implementation AutofillDialogFieldEditor
 
 - (void)mouseDown:(NSEvent*)event {
   // Delegate _must_ be notified before mouseDown is complete, since it needs
@@ skipping 80 matching lines @@
         base::SysUTF16ToNSString(autofillDialog->delegate()->DialogTitle())];
     [titleTextField_ sizeToFit];
 
     NSRect headerRect = clientRect;
     headerRect.size.height = kAccountChooserHeight;
     headerRect.origin.y = NSMaxY(clientRect);
     accountChooser_.reset([[AutofillAccountChooser alloc]
                               initWithFrame:headerRect
                                  delegate:autofillDialog->delegate()]);
 
-    loadingShieldTextField_.reset(
-        [[NSTextField alloc] initWithFrame:NSZeroRect]);
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    NSFont* loadingFont = rb.GetFont(
-        ui::ResourceBundle::BaseFont).DeriveFont(15).GetNativeFont();
-    [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_];
+    loadingShieldController_.reset(
+        [[AutofillLoadingShieldController alloc] init]);
+    [[loadingShieldController_ view] setHidden:YES];
 
     overlayController_.reset(
         [[AutofillOverlayController alloc] initWithDelegate:
             autofillDialog->delegate()]);
     [[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:
             [[[self window] contentView] frame]]);
     [flippedContentView setSubviews:
         @[accountChooser_,
           titleTextField_,
           [mainContainer_ view],
           [signInContainer_ view],
-          loadingShieldView,
+          [loadingShieldController_ view],
           [overlayController_ view]]];
     [flippedContentView setAutoresizingMask:
         (NSViewWidthSizable | NSViewHeightSizable)];
     [[[self window] contentView] addSubview:flippedContentView];
     [mainContainer_ setAnchorView:[[accountChooser_ subviews] objectAtIndex:1]];
   }
   return self;
 }
 
 - (void)dealloc {
@@ skipping 95 matching lines @@
 
   [accountChooser_ setFrame:headerRect];
   [accountChooser_ performLayout];
   if ([[signInContainer_ view] isHidden]) {
     [[mainContainer_ view] setFrame:mainRect];
     [mainContainer_ performLayout];
   } else {
     [[signInContainer_ view] setFrame:mainRect];
   }
 
-  // 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];
+  [[loadingShieldController_ view] setFrame:contentRect];
+  [loadingShieldController_ performLayout];
 
   [[overlayController_ view] setFrame:contentRect];
   [overlayController_ performLayout];
 
   NSRect frameRect = [[self window] frameRectForContentRect:contentRect];
   [[self window] setFrame:frameRect display:YES];
   [[self window] recalculateKeyViewLoop];
 }
 
 - (IBAction)accept:(id)sender {
@@ skipping 31 matching lines @@
 }
 
 - (void)updateNotificationArea {
   [mainContainer_ updateNotificationArea];
 }
 
 - (void)updateAccountChooser {
   [accountChooser_ update];
   [mainContainer_ updateLegalDocuments];
 
+  autofill::AutofillDialogViewDelegate* delegate = autofillDialog_->delegate();
   NSString* newLoadingMessage = @"";
-  if (autofillDialog_->delegate()->ShouldShowSpinner())
-    newLoadingMessage = l10n_util::GetNSStringWithFixup(IDS_TAB_LOADING_TITLE);
-  if (![newLoadingMessage isEqualToString:
-       [loadingShieldTextField_ stringValue]]) {
-    NSView* loadingShieldView = [loadingShieldTextField_ superview];
-    [loadingShieldTextField_ setStringValue:newLoadingMessage];
-    [loadingShieldTextField_ sizeToFit];
+  if (delegate->ShouldShowSpinner())
+    newLoadingMessage = base::SysUTF16ToNSString(delegate->SpinnerText());
+  if (![newLoadingMessage isEqualToString:[loadingShieldController_ message]]) {
+    [loadingShieldController_ setMessage:newLoadingMessage];

[groby-ooo-7-16, 2013/11/15 23:03:38]

Should that just move into the setMessage: call?

[Ilya Sherman, 2013/11/16 00:31:13]

Restructured this so that most of this logic is now encapsulated in the loading
shield.

 
     BOOL showShield = ([newLoadingMessage length] != 0);
 
     // For the duration of the loading shield, hide the main contents.
     // This prevents the currently focused text field "shining through".
     // No need to remember previous state, because the loading shield
     // always flows through to the main container.
     [[mainContainer_ view] setHidden:showShield];
-    [loadingShieldView setHidden:!showShield];
+    [[loadingShieldController_ view] setHidden:!showShield];
     [self requestRelayout];
   }
 }
 
 - (void)updateButtonStrip {
   [overlayController_ updateState];
 }
 
 - (void)updateSection:(autofill::DialogSection)section {
   [[mainContainer_ sectionForId:section] update];
@@ skipping 82 matching lines @@
 
 - (content::WebContents*)getSignInWebContents {
   return [signInContainer_ webContents];
 }
 
 - (BOOL)IsShowingOverlay {
   return ![[overlayController_ view] isHidden];
 }
 
 @end