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

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

 // Copyright (c) 2012 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/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 373 matching lines @@
   views::Checkbox* checkbox_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationView);
 };
 
 // A view that displays a loading message with some dancing dots.
 class LoadingAnimationView : public views::View,
                              public gfx::AnimationDelegate {
  public:
   explicit LoadingAnimationView(const base::string16& text) :
-      container_(new views::View()),
-      animation_(this) {
-
+      container_(new views::View()) {
     set_background(views::Background::CreateSolidBackground(
         GetNativeTheme()->GetSystemColor(
             ui::NativeTheme::kColorId_DialogBackground)));
 
     AddChildView(container_);
     container_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
     gfx::Font font = ui::ResourceBundle::GetSharedInstance().GetFont(
         ui::ResourceBundle::BaseFont).DeriveFont(8);
+    animation_.reset(new LoadingAnimation(this, font.GetHeight()))

[Evan Stade, 2013/11/16 01:20:48]

nit: the documentation for LoadingAnimation says you're supposed to pass the
font size, but here you pass the height (instead of font.GetFontSize()).

[Ilya Sherman, 2013/11/16 01:46:54]

Done.

 
     views::Label* label = new views::Label();
     label->SetText(text);
     label->SetFont(font);
     container_->AddChildView(label);
 
     for (size_t i = 0; i < 3; ++i) {
       views::Label* dot = new views::Label();
       dot->SetText(ASCIIToUTF16("."));
       dot->SetFont(font);
       container_->AddChildView(dot);
     }
   }
 
   virtual ~LoadingAnimationView() {}
 
   // views::View implementation.
   virtual void SetVisible(bool visible) OVERRIDE {
     if (visible)
-      animation_.Start();
+      animation_->Start();
     else
-      animation_.Reset();
+      animation_->Reset();
 
     views::View::SetVisible(visible);
   }
 
   virtual void Layout() OVERRIDE {
     gfx::Size container_size = container_->GetPreferredSize();
     gfx::Rect container_bounds((width() - container_size.width()) / 2,
                                (height() - container_size.height()) / 2,
                                container_size.width(),
                                container_size.height());
     container_->SetBoundsRect(container_bounds);
     container_->Layout();
 
     for (size_t i = 0; i < 3; ++i) {
       views::View* dot = container_->child_at(i + 1);
-      dot->SetY(dot->y() + animation_.GetCurrentValueForDot(i) * 10.0);
+      dot->SetY(dot->y() + animation_->GetCurrentValueForDot(i));
     }
   }
 
   // gfx::AnimationDelegate implementation.
   virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE {
-    DCHECK_EQ(animation, &animation_);
+    DCHECK_EQ(animation, animation_.get());
     Layout();
   }
 
  private:
   // Contains the "Loading" label and the dots.
   views::View* container_;
 
-  LoadingAnimation animation_;
+  scoped_ptr<LoadingAnimation> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadingAnimationView);
 };
 
 }  // namespace
 
 // AutofillDialogViews::AccountChooser -----------------------------------------
 
 AutofillDialogViews::AccountChooser::AccountChooser(
     AutofillDialogViewDelegate* delegate)
@@ skipping 1977 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill