[views] Add checkmark throbber to card unmasking prompt

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

 // Copyright 2014 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/card_unmask_prompt_views.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
 #include "chrome/browser/ui/views/autofill/decorated_textfield.h"
 #include "chrome/browser/ui/views/autofill/tooltip_icon.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/controls/throbber.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 namespace autofill {
 
 // The number of pixels of blank space on the outer horizontal edges of the
 // dialog.
 const int kEdgePadding = 19;
 
@@ skipping 15 matching lines @@
       main_contents_(nullptr),
       permanent_error_label_(nullptr),
       input_row_(nullptr),
       cvc_input_(nullptr),
       month_input_(nullptr),
       year_input_(nullptr),
       error_label_(nullptr),
       storage_row_(nullptr),
       storage_checkbox_(nullptr),
       progress_overlay_(nullptr),
+      progress_throbber_(nullptr),
       progress_label_(nullptr),
       overlay_animation_(this),
       weak_ptr_factory_(this) {
 }
 
 CardUnmaskPromptViews::~CardUnmaskPromptViews() {
   if (controller_)
     controller_->OnUnmaskDialogClosed();
 }
 
 void CardUnmaskPromptViews::Show() {
   constrained_window::ShowWebModalDialogViews(this,
                                               controller_->GetWebContents());
 }
 
 void CardUnmaskPromptViews::ControllerGone() {
   controller_ = nullptr;
   ClosePrompt();
 }
 
 void CardUnmaskPromptViews::DisableAndWaitForVerification() {
   SetInputsEnabled(false);
   progress_overlay_->SetOpacity(0.0);
   progress_overlay_->SetVisible(true);
+  progress_throbber_->Start();
   overlay_animation_.Show();
   GetDialogClientView()->UpdateDialogButtons();
   Layout();
 }
 
 void CardUnmaskPromptViews::GotVerificationResult(
     const base::string16& error_message,
     bool allow_retry) {
+  progress_throbber_->Stop();
   if (error_message.empty()) {
     progress_label_->SetText(l10n_util::GetStringUTF16(
         IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_SUCCESS));
+    progress_throbber_->SetChecked(true);
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, base::Bind(&CardUnmaskPromptViews::ClosePrompt,
                               weak_ptr_factory_.GetWeakPtr()),
         controller_->GetSuccessMessageDuration());
   } else {
     // TODO(estade): it's somewhat jarring when the error comes back too
     // quickly.
     overlay_animation_.Reset();
     storage_row_->SetOpacity(1.0);
     progress_overlay_->SetVisible(false);
@@ skipping 107 matching lines @@
   const gfx::Insets insets = GetInsets();
   return main_contents_->GetHeightForWidth(width - insets.width()) +
          insets.height();
 }
 
 void CardUnmaskPromptViews::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   SkColor bg_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
   progress_overlay_->set_background(
       views::Background::CreateSolidBackground(bg_color));
+  progress_label_->SetBackgroundColor(bg_color);
 }
 
 ui::ModalType CardUnmaskPromptViews::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
 base::string16 CardUnmaskPromptViews::GetWindowTitle() const {
   return controller_->GetWindowTitle();
 }
 
@@ skipping 154 matching lines @@
   // Reserve vertical space for the error label, assuming it's one line.
   error_label_ = new views::Label(base::ASCIIToUTF16(" "));
   error_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   error_label_->SetEnabledColor(kWarningColor);
   error_label_->SetBorder(views::Border::CreateEmptyBorder(3, 0, 5, 0));
   controls_container->AddChildView(error_label_);
 
   progress_overlay_ = new FadeOutView();
   progress_overlay_->set_fade_everything(true);
   views::BoxLayout* progress_layout =
-      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
+      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 5);
+  progress_layout->set_cross_axis_alignment(
+      views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   progress_layout->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
-  progress_layout->set_cross_axis_alignment(
-      views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   progress_overlay_->SetLayoutManager(progress_layout);
 
   progress_overlay_->SetVisible(false);
   AddChildView(progress_overlay_);
 
+  progress_throbber_ = new views::CheckmarkThrobber();
+  progress_overlay_->AddChildView(progress_throbber_);
+
   progress_label_ = new views::Label(l10n_util::GetStringUTF16(
       IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_IN_PROGRESS));
+  // Material blue. TODO(estade): find an appropriate place for this color.
+  progress_label_->SetEnabledColor(SkColorSetRGB(0x42, 0x85, 0xF4));
   progress_overlay_->AddChildView(progress_label_);
 }
 
 bool CardUnmaskPromptViews::ExpirationDateIsValid() const {
   if (!controller_->ShouldRequestExpirationDate())
     return true;
 
   return controller_->InputExpirationIsValid(
       month_input_->GetTextForRow(month_input_->selected_index()),
       year_input_->GetTextForRow(year_input_->selected_index()));
@@ skipping 28 matching lines @@
   views::View::OnPaint(canvas);
   canvas->Restore();
 }
 
 void CardUnmaskPromptViews::FadeOutView::SetOpacity(double opacity) {
   opacity_ = opacity;
   SchedulePaint();
 }
 
 }  // namespace autofill