Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6156)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc

Issue 1020013003: Add a regression test for the CardUnmaskPrompt. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EXPECT Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/autofill/card_unmask_prompt_views.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc
diff --git a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc
index d0fd788bfd0bce5d9b46a2491f362b9247cc0535..638e300915628d9b498a5bababf0aade211a44b4 100644
--- a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc
+++ b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc
@@ -2,12 +2,12 @@
// 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_models.h"
#include "chrome/browser/ui/autofill/autofill_dialog_types.h"
#include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
-#include "chrome/browser/ui/autofill/card_unmask_prompt_view.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"
@@ -22,19 +22,14 @@
#include "ui/views/background.h"
#include "ui/views/controls/button/checkbox.h"
#include "ui/views/controls/combobox/combobox.h"
-#include "ui/views/controls/combobox/combobox_listener.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
-#include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/widget/widget.h"
#include "ui/views/window/dialog_client_view.h"
-#include "ui/views/window/dialog_delegate.h"
namespace autofill {
-namespace {
-
// The number of pixels of blank space on the outer horizontal edges of the
// dialog.
const int kEdgePadding = 19;
@@ -43,396 +38,366 @@ const int kEdgePadding = 19;
SkColor kShadingColor = SkColorSetARGB(7, 0, 0, 0);
SkColor kSubtleBorderColor = SkColorSetARGB(10, 0, 0, 0);
-class CardUnmaskPromptViews : public CardUnmaskPromptView,
- views::ComboboxListener,
- views::DialogDelegateView,
- views::TextfieldController {
- public:
- explicit CardUnmaskPromptViews(CardUnmaskPromptController* controller)
- : controller_(controller),
- main_contents_(nullptr),
- permanent_error_label_(nullptr),
- cvc_input_(nullptr),
- month_input_(nullptr),
- year_input_(nullptr),
- error_label_(nullptr),
- storage_checkbox_(nullptr),
- progress_overlay_(nullptr),
- progress_label_(nullptr),
- weak_ptr_factory_(this) {}
-
- ~CardUnmaskPromptViews() override {
- if (controller_)
- controller_->OnUnmaskDialogClosed();
- }
+// static
+CardUnmaskPromptView* CardUnmaskPromptView::CreateAndShow(
+ CardUnmaskPromptController* controller) {
+ CardUnmaskPromptViews* view = new CardUnmaskPromptViews(controller);
+ view->Show();
+ return view;
+}
- void Show() {
- constrained_window::ShowWebModalDialogViews(this,
- controller_->GetWebContents());
- }
+CardUnmaskPromptViews::CardUnmaskPromptViews(
+ CardUnmaskPromptController* controller)
+ : controller_(controller),
+ main_contents_(nullptr),
+ permanent_error_label_(nullptr),
+ cvc_input_(nullptr),
+ month_input_(nullptr),
+ year_input_(nullptr),
+ error_label_(nullptr),
+ storage_checkbox_(nullptr),
+ progress_overlay_(nullptr),
+ progress_label_(nullptr),
+ weak_ptr_factory_(this) {
+}
- // CardUnmaskPromptView
- void ControllerGone() override {
- controller_ = nullptr;
- ClosePrompt();
- }
+CardUnmaskPromptViews::~CardUnmaskPromptViews() {
+ if (controller_)
+ controller_->OnUnmaskDialogClosed();
+}
- void DisableAndWaitForVerification() override {
- SetInputsEnabled(false);
- progress_overlay_->SetVisible(true);
- GetDialogClientView()->UpdateDialogButtons();
- Layout();
- }
+void CardUnmaskPromptViews::Show() {
+ constrained_window::ShowWebModalDialogViews(this,
+ controller_->GetWebContents());
+}
- void GotVerificationResult(const base::string16& error_message,
- bool allow_retry) override {
- if (error_message.empty()) {
- progress_label_->SetText(l10n_util::GetStringUTF16(
- IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_SUCCESS));
- base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE, base::Bind(&CardUnmaskPromptViews::ClosePrompt,
- weak_ptr_factory_.GetWeakPtr()),
- base::TimeDelta::FromSeconds(1));
- } else {
- // TODO(estade): it's somewhat jarring when the error comes back too
- // quickly.
- progress_overlay_->SetVisible(false);
-
- if (allow_retry) {
- SetInputsEnabled(true);
-
- // If there is more than one input showing, don't mark anything as
- // invalid since we don't know the location of the problem.
- if (!controller_->ShouldRequestExpirationDate())
- cvc_input_->SetInvalid(true);
-
- // TODO(estade): When do we hide |error_label_|?
- SetRetriableErrorMessage(error_message);
- } else {
- permanent_error_label_->SetText(error_message);
- permanent_error_label_->SetVisible(true);
- SetRetriableErrorMessage(base::string16());
- }
-
- GetDialogClientView()->UpdateDialogButtons();
- }
+void CardUnmaskPromptViews::ControllerGone() {
+ controller_ = nullptr;
+ ClosePrompt();
+}
- Layout();
- }
+void CardUnmaskPromptViews::DisableAndWaitForVerification() {
+ SetInputsEnabled(false);
+ progress_overlay_->SetVisible(true);
+ GetDialogClientView()->UpdateDialogButtons();
+ Layout();
+}
- void SetRetriableErrorMessage(const base::string16& message) {
- if (message.empty()) {
- error_label_->SetMultiLine(false);
- error_label_->SetText(base::ASCIIToUTF16(" "));
- } else {
- error_label_->SetMultiLine(true);
- error_label_->SetText(message);
- }
+void CardUnmaskPromptViews::GotVerificationResult(
+ const base::string16& error_message,
+ bool allow_retry) {
+ if (error_message.empty()) {
+ progress_label_->SetText(l10n_util::GetStringUTF16(
+ IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_SUCCESS));
+ 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.
+ progress_overlay_->SetVisible(false);
- // Update the dialog's size.
- if (GetWidget() && controller_->GetWebContents()) {
- constrained_window::UpdateWebContentsModalDialogPosition(
- GetWidget(),
- web_modal::WebContentsModalDialogManager::FromWebContents(
- controller_->GetWebContents())
- ->delegate()
- ->GetWebContentsModalDialogHost());
- }
- }
+ if (allow_retry) {
+ SetInputsEnabled(true);
- void SetInputsEnabled(bool enabled) {
- cvc_input_->SetEnabled(enabled);
- storage_checkbox_->SetEnabled(enabled);
+ // If there is more than one input showing, don't mark anything as
+ // invalid since we don't know the location of the problem.
+ if (!controller_->ShouldRequestExpirationDate())
+ cvc_input_->SetInvalid(true);
- if (month_input_)
- month_input_->SetEnabled(enabled);
- if (year_input_)
- year_input_->SetEnabled(enabled);
+ // TODO(estade): When do we hide |error_label_|?
+ SetRetriableErrorMessage(error_message);
+ } else {
+ permanent_error_label_->SetText(error_message);
+ permanent_error_label_->SetVisible(true);
+ SetRetriableErrorMessage(base::string16());
+ }
+ GetDialogClientView()->UpdateDialogButtons();
}
- // views::DialogDelegateView
- View* GetContentsView() override {
- InitIfNecessary();
- return this;
- }
+ Layout();
+}
- views::View* CreateFootnoteView() override {
- // Local storage checkbox and (?) tooltip.
- views::View* storage_row = new views::View();
- views::BoxLayout* storage_row_layout = new views::BoxLayout(
- views::BoxLayout::kHorizontal, kEdgePadding, kEdgePadding, 0);
- storage_row->SetLayoutManager(storage_row_layout);
- storage_row->SetBorder(
- views::Border::CreateSolidSidedBorder(1, 0, 0, 0, kSubtleBorderColor));
- storage_row->set_background(
- views::Background::CreateSolidBackground(kShadingColor));
-
- storage_checkbox_ = new views::Checkbox(l10n_util::GetStringUTF16(
- IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_CHECKBOX));
- storage_checkbox_->SetChecked(controller_->GetStoreLocallyStartState());
- storage_row->AddChildView(storage_checkbox_);
- storage_row_layout->SetFlexForView(storage_checkbox_, 1);
-
- storage_row->AddChildView(new TooltipIcon(l10n_util::GetStringUTF16(
- IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_TOOLTIP)));
-
- return storage_row;
+void CardUnmaskPromptViews::SetRetriableErrorMessage(
+ const base::string16& message) {
+ if (message.empty()) {
+ error_label_->SetMultiLine(false);
+ error_label_->SetText(base::ASCIIToUTF16(" "));
+ } else {
+ error_label_->SetMultiLine(true);
+ error_label_->SetText(message);
}
- // views::View
- gfx::Size GetPreferredSize() const override {
- // Must hardcode a width so the label knows where to wrap. TODO(estade):
- // This can lead to a weird looking dialog if we end up getting allocated
- // more width than we ask for, e.g. if the title is super long.
- const int kWidth = 375;
- return gfx::Size(kWidth, GetHeightForWidth(kWidth));
+ // Update the dialog's size.
+ if (GetWidget() && controller_->GetWebContents()) {
+ constrained_window::UpdateWebContentsModalDialogPosition(
+ GetWidget(), web_modal::WebContentsModalDialogManager::FromWebContents(
+ controller_->GetWebContents())
+ ->delegate()
+ ->GetWebContentsModalDialogHost());
}
+}
- void Layout() override {
- for (int i = 0; i < child_count(); ++i) {
- child_at(i)->SetBoundsRect(GetContentsBounds());
- }
- }
+void CardUnmaskPromptViews::SetInputsEnabled(bool enabled) {
+ cvc_input_->SetEnabled(enabled);
+ storage_checkbox_->SetEnabled(enabled);
- int GetHeightForWidth(int width) const override {
- if (!has_children())
- return 0;
- const gfx::Insets insets = GetInsets();
- return main_contents_->GetHeightForWidth(width - insets.width()) +
- insets.height();
- }
+ if (month_input_)
+ month_input_->SetEnabled(enabled);
+ if (year_input_)
+ year_input_->SetEnabled(enabled);
+}
- void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
- SkColor bg_color =
- theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
- bg_color = SkColorSetA(bg_color, 0xDD);
- progress_overlay_->set_background(
- views::Background::CreateSolidBackground(bg_color));
- }
+views::View* CardUnmaskPromptViews::GetContentsView() {
+ InitIfNecessary();
+ return this;
+}
- ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_CHILD; }
+views::View* CardUnmaskPromptViews::CreateFootnoteView() {
+ // Local storage checkbox and (?) tooltip.
+ views::View* storage_row = new views::View();
+ views::BoxLayout* storage_row_layout = new views::BoxLayout(
+ views::BoxLayout::kHorizontal, kEdgePadding, kEdgePadding, 0);
+ storage_row->SetLayoutManager(storage_row_layout);
+ storage_row->SetBorder(
+ views::Border::CreateSolidSidedBorder(1, 0, 0, 0, kSubtleBorderColor));
+ storage_row->set_background(
+ views::Background::CreateSolidBackground(kShadingColor));
+
+ storage_checkbox_ = new views::Checkbox(l10n_util::GetStringUTF16(
+ IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_CHECKBOX));
+ storage_checkbox_->SetChecked(controller_->GetStoreLocallyStartState());
+ storage_row->AddChildView(storage_checkbox_);
+ storage_row_layout->SetFlexForView(storage_checkbox_, 1);
+
+ storage_row->AddChildView(new TooltipIcon(l10n_util::GetStringUTF16(
+ IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_TOOLTIP)));
+
+ return storage_row;
+}
- base::string16 GetWindowTitle() const override {
- return controller_->GetWindowTitle();
+gfx::Size CardUnmaskPromptViews::GetPreferredSize() const {
+ // Must hardcode a width so the label knows where to wrap. TODO(estade):
+ // This can lead to a weird looking dialog if we end up getting allocated
+ // more width than we ask for, e.g. if the title is super long.
+ const int kWidth = 375;
+ return gfx::Size(kWidth, GetHeightForWidth(kWidth));
+}
+
+void CardUnmaskPromptViews::Layout() {
+ for (int i = 0; i < child_count(); ++i) {
+ child_at(i)->SetBoundsRect(GetContentsBounds());
}
+}
- void DeleteDelegate() override { delete this; }
+int CardUnmaskPromptViews::GetHeightForWidth(int width) const {
+ if (!has_children())
+ return 0;
+ const gfx::Insets insets = GetInsets();
+ return main_contents_->GetHeightForWidth(width - insets.width()) +
+ insets.height();
+}
- int GetDialogButtons() const override {
- return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
- }
+void CardUnmaskPromptViews::OnNativeThemeChanged(const ui::NativeTheme* theme) {
+ SkColor bg_color =
+ theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
+ bg_color = SkColorSetA(bg_color, 0xDD);
+ progress_overlay_->set_background(
+ views::Background::CreateSolidBackground(bg_color));
+}
- base::string16 GetDialogButtonLabel(ui::DialogButton button) const override {
- if (button == ui::DIALOG_BUTTON_OK)
- return l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_UNMASK_CONFIRM_BUTTON);
+ui::ModalType CardUnmaskPromptViews::GetModalType() const {
+ return ui::MODAL_TYPE_CHILD;
+}
- return DialogDelegateView::GetDialogButtonLabel(button);
- }
+base::string16 CardUnmaskPromptViews::GetWindowTitle() const {
+ return controller_->GetWindowTitle();
+}
- bool ShouldDefaultButtonBeBlue() const override { return true; }
+void CardUnmaskPromptViews::DeleteDelegate() {
+ delete this;
+}
- bool IsDialogButtonEnabled(ui::DialogButton button) const override {
- if (button == ui::DIALOG_BUTTON_CANCEL)
- return true;
+int CardUnmaskPromptViews::GetDialogButtons() const {
+ return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
+}
- DCHECK_EQ(ui::DIALOG_BUTTON_OK, button);
+base::string16 CardUnmaskPromptViews::GetDialogButtonLabel(
+ ui::DialogButton button) const {
+ if (button == ui::DIALOG_BUTTON_OK)
+ return l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_UNMASK_CONFIRM_BUTTON);
- return cvc_input_->enabled() &&
- controller_->InputCvcIsValid(cvc_input_->text()) &&
- ExpirationDateIsValid();
- }
+ return DialogDelegateView::GetDialogButtonLabel(button);
+}
- views::View* GetInitiallyFocusedView() override { return cvc_input_; }
+bool CardUnmaskPromptViews::ShouldDefaultButtonBeBlue() const {
+ return true;
+}
- bool Cancel() override {
+bool CardUnmaskPromptViews::IsDialogButtonEnabled(
+ ui::DialogButton button) const {
+ if (button == ui::DIALOG_BUTTON_CANCEL)
return true;
- }
- bool Accept() override {
- if (!controller_)
- return true;
-
- controller_->OnUnmaskResponse(
- cvc_input_->text(),
- month_input_
- ? month_input_->GetTextForRow(month_input_->selected_index())
- : base::string16(),
- year_input_ ? year_input_->GetTextForRow(year_input_->selected_index())
- : base::string16(),
- storage_checkbox_ ? storage_checkbox_->checked() : false);
- return false;
- }
+ DCHECK_EQ(ui::DIALOG_BUTTON_OK, button);
- // views::TextfieldController
- void ContentsChanged(views::Textfield* sender,
- const base::string16& new_contents) override {
- if (controller_->InputCvcIsValid(new_contents))
- cvc_input_->SetInvalid(false);
+ return cvc_input_->enabled() &&
+ controller_->InputCvcIsValid(cvc_input_->text()) &&
+ ExpirationDateIsValid();
+}
- GetDialogClientView()->UpdateDialogButtons();
- }
+views::View* CardUnmaskPromptViews::GetInitiallyFocusedView() {
+ return cvc_input_;
+}
- // views::ComboboxListener
- void OnPerformAction(views::Combobox* combobox) override {
- if (ExpirationDateIsValid()) {
- if (month_input_->invalid()) {
- month_input_->SetInvalid(false);
- year_input_->SetInvalid(false);
- error_label_->SetMultiLine(false);
- SetRetriableErrorMessage(base::string16());
- }
- } else if (month_input_->selected_index() !=
- month_combobox_model_.GetDefaultIndex() &&
- year_input_->selected_index() !=
- year_combobox_model_.GetDefaultIndex()) {
- month_input_->SetInvalid(true);
- year_input_->SetInvalid(true);
- error_label_->SetMultiLine(true);
- SetRetriableErrorMessage(l10n_util::GetStringUTF16(
- IDS_AUTOFILL_CARD_UNMASK_INVALID_EXPIRATION_DATE));
- }
+bool CardUnmaskPromptViews::Cancel() {
+ return true;
+}
- GetDialogClientView()->UpdateDialogButtons();
- }
+bool CardUnmaskPromptViews::Accept() {
+ if (!controller_)
+ return true;
- private:
- void InitIfNecessary() {
- if (has_children())
- return;
-
- main_contents_ = new views::View();
- main_contents_->SetLayoutManager(
- new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 10));
- AddChildView(main_contents_);
-
- permanent_error_label_ = new views::Label();
- permanent_error_label_->set_background(
- views::Background::CreateSolidBackground(
- SkColorSetRGB(0xdb, 0x44, 0x37)));
- permanent_error_label_->SetBorder(
- views::Border::CreateEmptyBorder(10, kEdgePadding, 10, kEdgePadding));
- permanent_error_label_->SetEnabledColor(SK_ColorWHITE);
- permanent_error_label_->SetAutoColorReadabilityEnabled(false);
- permanent_error_label_->SetVisible(false);
- permanent_error_label_->SetMultiLine(true);
- permanent_error_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- main_contents_->AddChildView(permanent_error_label_);
-
- views::View* controls_container = new views::View();
- controls_container->SetLayoutManager(
- new views::BoxLayout(views::BoxLayout::kVertical, kEdgePadding, 0, 0));
- main_contents_->AddChildView(controls_container);
-
- views::Label* instructions =
- new views::Label(controller_->GetInstructionsMessage());
-
- instructions->SetMultiLine(true);
- instructions->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- instructions->SetBorder(views::Border::CreateEmptyBorder(0, 0, 15, 0));
- controls_container->AddChildView(instructions);
-
- views::View* input_row = new views::View();
- input_row->SetLayoutManager(
- new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 5));
- controls_container->AddChildView(input_row);
-
- if (controller_->ShouldRequestExpirationDate()) {
- month_input_ = new views::Combobox(&month_combobox_model_);
- month_input_->set_listener(this);
- input_row->AddChildView(month_input_);
- input_row->AddChildView(new views::Label(l10n_util::GetStringUTF16(
- IDS_AUTOFILL_CARD_UNMASK_EXPIRATION_DATE_SEPARATOR)));
- year_input_ = new views::Combobox(&year_combobox_model_);
- year_input_->set_listener(this);
- input_row->AddChildView(year_input_);
-
- input_row->AddChildView(new views::Label(base::ASCIIToUTF16(" ")));
- }
+ controller_->OnUnmaskResponse(
+ cvc_input_->text(),
+ month_input_ ? month_input_->GetTextForRow(month_input_->selected_index())
+ : base::string16(),
+ year_input_ ? year_input_->GetTextForRow(year_input_->selected_index())
+ : base::string16(),
+ storage_checkbox_ ? storage_checkbox_->checked() : false);
+ return false;
+}
- cvc_input_ = new DecoratedTextfield(
- base::string16(),
- l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC),
- this);
- cvc_input_->set_default_width_in_chars(8);
- input_row->AddChildView(cvc_input_);
-
- views::ImageView* cvc_image = new views::ImageView();
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- cvc_image->SetImage(rb.GetImageSkiaNamed(controller_->GetCvcImageRid()));
- input_row->AddChildView(cvc_image);
-
- // 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 views::View();
- views::BoxLayout* progress_layout =
- new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
- 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);
+void CardUnmaskPromptViews::ContentsChanged(
+ views::Textfield* sender,
+ const base::string16& new_contents) {
+ if (controller_->InputCvcIsValid(new_contents))
+ cvc_input_->SetInvalid(false);
- progress_overlay_->SetVisible(false);
- AddChildView(progress_overlay_);
+ GetDialogClientView()->UpdateDialogButtons();
+}
- progress_label_ = new views::Label(l10n_util::GetStringUTF16(
- IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_IN_PROGRESS));
- progress_overlay_->AddChildView(progress_label_);
+void CardUnmaskPromptViews::OnPerformAction(views::Combobox* combobox) {
+ if (ExpirationDateIsValid()) {
+ if (month_input_->invalid()) {
+ month_input_->SetInvalid(false);
+ year_input_->SetInvalid(false);
+ error_label_->SetMultiLine(false);
+ SetRetriableErrorMessage(base::string16());
+ }
+ } else if (month_input_->selected_index() !=
+ month_combobox_model_.GetDefaultIndex() &&
+ year_input_->selected_index() !=
+ year_combobox_model_.GetDefaultIndex()) {
+ month_input_->SetInvalid(true);
+ year_input_->SetInvalid(true);
+ error_label_->SetMultiLine(true);
+ SetRetriableErrorMessage(l10n_util::GetStringUTF16(
+ IDS_AUTOFILL_CARD_UNMASK_INVALID_EXPIRATION_DATE));
}
- void ClosePrompt() { GetWidget()->Close(); }
-
- bool ExpirationDateIsValid() const {
- if (!controller_->ShouldRequestExpirationDate())
- return true;
+ GetDialogClientView()->UpdateDialogButtons();
+}
- return controller_->InputExpirationIsValid(
- month_input_->GetTextForRow(month_input_->selected_index()),
- year_input_->GetTextForRow(year_input_->selected_index()));
+void CardUnmaskPromptViews::InitIfNecessary() {
+ if (has_children())
+ return;
+
+ main_contents_ = new views::View();
+ main_contents_->SetLayoutManager(
+ new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 10));
+ AddChildView(main_contents_);
+
+ permanent_error_label_ = new views::Label();
+ permanent_error_label_->set_background(
+ views::Background::CreateSolidBackground(
+ SkColorSetRGB(0xdb, 0x44, 0x37)));
+ permanent_error_label_->SetBorder(
+ views::Border::CreateEmptyBorder(10, kEdgePadding, 10, kEdgePadding));
+ permanent_error_label_->SetEnabledColor(SK_ColorWHITE);
+ permanent_error_label_->SetAutoColorReadabilityEnabled(false);
+ permanent_error_label_->SetVisible(false);
+ permanent_error_label_->SetMultiLine(true);
+ permanent_error_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+ main_contents_->AddChildView(permanent_error_label_);
+
+ views::View* controls_container = new views::View();
+ controls_container->SetLayoutManager(
+ new views::BoxLayout(views::BoxLayout::kVertical, kEdgePadding, 0, 0));
+ main_contents_->AddChildView(controls_container);
+
+ views::Label* instructions =
+ new views::Label(controller_->GetInstructionsMessage());
+
+ instructions->SetMultiLine(true);
+ instructions->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+ instructions->SetBorder(views::Border::CreateEmptyBorder(0, 0, 15, 0));
+ controls_container->AddChildView(instructions);
+
+ views::View* input_row = new views::View();
+ input_row->SetLayoutManager(
+ new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 5));
+ controls_container->AddChildView(input_row);
+
+ if (controller_->ShouldRequestExpirationDate()) {
+ month_input_ = new views::Combobox(&month_combobox_model_);
+ month_input_->set_listener(this);
+ input_row->AddChildView(month_input_);
+ input_row->AddChildView(new views::Label(l10n_util::GetStringUTF16(
+ IDS_AUTOFILL_CARD_UNMASK_EXPIRATION_DATE_SEPARATOR)));
+ year_input_ = new views::Combobox(&year_combobox_model_);
+ year_input_->set_listener(this);
+ input_row->AddChildView(year_input_);
+ input_row->AddChildView(new views::Label(base::ASCIIToUTF16(" ")));
}
- CardUnmaskPromptController* controller_;
-
- views::View* main_contents_;
-
- // The error label for permanent errors (where the user can't retry).
- views::Label* permanent_error_label_;
-
- DecoratedTextfield* cvc_input_;
-
- // These will be null when expiration date is not required.
- views::Combobox* month_input_;
- views::Combobox* year_input_;
-
- MonthComboboxModel month_combobox_model_;
- YearComboboxModel year_combobox_model_;
-
- // The error label for most errors, which lives beneath the inputs.
- views::Label* error_label_;
-
- views::Checkbox* storage_checkbox_;
-
- views::View* progress_overlay_;
- views::Label* progress_label_;
-
- base::WeakPtrFactory<CardUnmaskPromptViews> weak_ptr_factory_;
+ cvc_input_ = new DecoratedTextfield(
+ base::string16(),
+ l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC), this);
+ cvc_input_->set_default_width_in_chars(8);
+ input_row->AddChildView(cvc_input_);
+
+ views::ImageView* cvc_image = new views::ImageView();
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+ cvc_image->SetImage(rb.GetImageSkiaNamed(controller_->GetCvcImageRid()));
+ input_row->AddChildView(cvc_image);
+
+ // 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 views::View();
+ views::BoxLayout* progress_layout =
+ new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
+ 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_label_ = new views::Label(l10n_util::GetStringUTF16(
+ IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_IN_PROGRESS));
+ progress_overlay_->AddChildView(progress_label_);
+}
- DISALLOW_COPY_AND_ASSIGN(CardUnmaskPromptViews);
-};
+bool CardUnmaskPromptViews::ExpirationDateIsValid() const {
+ if (!controller_->ShouldRequestExpirationDate())
+ return true;
-} // namespace
+ return controller_->InputExpirationIsValid(
+ month_input_->GetTextForRow(month_input_->selected_index()),
+ year_input_->GetTextForRow(year_input_->selected_index()));
+}
-// static
-CardUnmaskPromptView* CardUnmaskPromptView::CreateAndShow(
- CardUnmaskPromptController* controller) {
- CardUnmaskPromptViews* view = new CardUnmaskPromptViews(controller);
- view->Show();
- return view;
+void CardUnmaskPromptViews::ClosePrompt() {
+ GetWidget()->Close();
}
} // namespace autofill
« no previous file with comments | « chrome/browser/ui/views/autofill/card_unmask_prompt_views.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698