Interactive autofill: Handle Online Wallet being unavailable.

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/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/wallet/wallet_service_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 23 matching lines @@
 namespace {
 
 // Size of the triangular mark that indicates an invalid textfield.
 const size_t kDogEarSize = 10;
 
 const size_t kAutocheckoutProgressBarWidth = 300;
 const size_t kAutocheckoutProgressBarHeight = 11;
 
 const size_t kArrowHeight = 7;
 const size_t kArrowWidth = 2 * kArrowHeight;
-const int kArrowEndOffset = 83;
 
 const char kDecoratedTextfieldClassName[] = "autofill/DecoratedTextfield";
 const char kNotificationAreaClassName[] = "autofill/NotificationArea";
 
 // Returns a label that describes a details section.
 views::Label* CreateDetailsSectionLabel(const string16& text) {
   views::Label* label = new views::Label(text);
   label->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   label->SetFont(label->font().DeriveFont(0, gfx::Font::BOLD));
   // TODO(estade): this should be made to match the native textfield top
@@ skipping 54 matching lines @@
     dog_ear.lineTo(width(), 0);
     dog_ear.lineTo(width(), kDogEarSize);
     dog_ear.close();
     canvas->ClipPath(dog_ear);
     canvas->DrawColor(SK_ColorRED);
   }
 }
 
 // AutofillDialogViews::NotificationArea ---------------------------------------
 
-AutofillDialogViews::NotificationArea::NotificationArea()
-    : label_(new views::Label()) {
+AutofillDialogViews::NotificationArea::NotificationArea(
+    views::View* arrow_centering_anchor)
+    : label_(new views::Label()),
+      arrow_centering_anchor_(arrow_centering_anchor) {

[sky, 2013/02/11 21:07:34]

Can you instead get what you need from arrow_centering_anchor rather than making
it a member (looks like on the width). That way you don't have to worry about
owernship.

[Dan Beam, 2013/02/11 21:53:54]

The width of |arrow_centering_anchor_| varies a lot while the dialog is open and
can affect the positioning of the arrow.  I can denote that it's weak more
clearly, though - does that work?  This class definitely doesn't own
|arrow_centering_anchor_| at all.

[sky, 2013/02/11 22:05:55]

No need to denote more heavily. I was hoping you could get rid of it entirely.
How do you know |arrow_centering_anchor| out lives the dialog?

[Dan Beam, 2013/02/11 23:11:43]

It's not guaranteed to, and it probably depends on something  fragile like these
Views' order in the hierarchy (sounds not fun to debug that crash).  See if you
like the updated code.  /cc estade@

+  DCHECK(arrow_centering_anchor_);
+
   views::BoxLayout* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
   layout->set_spread_blank_space(true);
   SetLayoutManager(layout);
 
   // This background is re-used and the color is changed in |SetNotification()|.
   label_->set_background(
       views::Background::CreateSolidBackground(SK_ColorTRANSPARENT));
   label_->set_border(views::Border::CreateEmptyBorder(10, 10, 10, 10));
   label_->set_collapse_when_hidden(true);
@@ skipping 24 matching lines @@
 }
 
 std::string AutofillDialogViews::NotificationArea::GetClassName() const {
   return kNotificationAreaClassName;
 }
 
 void AutofillDialogViews::NotificationArea::OnPaint(gfx::Canvas* canvas) {
   views::View::OnPaint(canvas);
 
   if (notification_.HasArrow()) {
-    // Not using GetMirroredXWithWidthInView() here because the code would still
-    // need to subtract the width of the arrow from the result in RTL.
-    const int start_x = base::i18n::IsRTL() ? kArrowEndOffset :
-        width() - kArrowEndOffset - kArrowWidth;
+    const int half_arrow = kArrowWidth / 2.0f;
+    const int arrow_middle = GetMirroredXInView(
+        width() - arrow_centering_anchor_->width() / 2.0f - half_arrow);
+
     SkPath arrow;
-    arrow.moveTo(start_x, kArrowHeight);
-    arrow.lineTo(start_x + kArrowWidth, kArrowHeight);
-    arrow.lineTo(start_x + kArrowWidth / 2.0f, 0);
+    arrow.moveTo(arrow_middle - half_arrow, kArrowHeight);
+    arrow.lineTo(arrow_middle + half_arrow, kArrowHeight);
+    arrow.lineTo(arrow_middle, 0);
     arrow.close();
     canvas->ClipPath(arrow);
     canvas->DrawColor(notification_.GetBackgroundColor());
   }
 }
 
 // AutofillDialogViews::SectionContainer ---------------------------------------
 
 AutofillDialogViews::SectionContainer::SectionContainer(
     const string16& label,
@@ skipping 157 matching lines @@
 
 // AutofillDialogViews ---------------------------------------------------------
 
 AutofillDialogViews::AutofillDialogViews(AutofillDialogController* controller)
     : controller_(controller),
       did_submit_(false),
       window_(NULL),
       contents_(NULL),
       notification_area_(NULL),
       use_billing_for_shipping_(NULL),
-      sign_in_link_(NULL),
+      account_chooser_link_(NULL),
       sign_in_container_(NULL),
       cancel_sign_in_(NULL),
       sign_in_webview_(NULL),
       main_container_(NULL),
       button_strip_extra_view_(NULL),
       save_in_chrome_checkbox_(NULL),
       autocheckout_progress_bar_view_(NULL),
       autocheckout_progress_bar_(NULL),
       focus_manager_(NULL) {
   DCHECK(controller);
@@ skipping 23 matching lines @@
   focus_manager_ = window_->GetFocusManager();
   focus_manager_->AddFocusChangeListener(this);
 }
 
 void AutofillDialogViews::Hide() {
   if (window_)
     window_->CloseWebContentsModalDialog();
 }
 
 void AutofillDialogViews::UpdateAccountChooser() {
-  DialogSignedInState state = controller_->SignedInState();
-  sign_in_link_->SetEnabled(state != REQUIRES_RESPONSE);
-  sign_in_link_->SetVisible(state != SIGNED_IN);
+  // TODO(dbeam): show/hide account chooser combobox when it exists?
+  // TODO(dbeam): show/hide fancy Google Wallet logo when it exists.
+  account_chooser_link_->SetText(controller_->AccountChooserText());
+  account_chooser_link_->SetEnabled(controller_->AccountChooserEnabled());
 }
 
 void AutofillDialogViews::UpdateNotificationArea() {
   DCHECK(notification_area_);
   notification_area_->SetNotification(controller_->CurrentNotification());
 
   if (GetWidget())
     GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
 
   contents_->Layout();
@@ skipping 180 matching lines @@
     views::View* focused_now) {
   controller_->FocusMoved();
 }
 
 void AutofillDialogViews::OnDidChangeFocus(
     views::View* focused_before,
     views::View* focused_now) {}
 
 void AutofillDialogViews::LinkClicked(views::Link* source, int event_flags) {
   // Sign in link.
-  if (source == sign_in_link_) {
-    controller_->StartSignInFlow();
+  if (source == account_chooser_link_) {
+    if (controller_->SignedInState() != SIGNED_IN) {
+      DCHECK(controller_->CanPayWithWallet());
+      controller_->StartSignInFlow();
+    }
+    // TODO(dbeam): handle other clicks on the account chooser (i.e. combobox).
     return;
   }
 
   // Edit links.
   for (DetailGroupMap::iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
     if (iter->second.suggested_info->Contains(source)) {
       controller_->EditClickedForSection(iter->first);
       return;
     }
@@ skipping 54 matching lines @@
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
 
   layout->StartRow(0, single_column_set);
   // TODO(abodenha) Create a chooser control to allow account selection.
   // See http://crbug.com/169858
-  sign_in_link_ = new views::Link(controller_->SignInText());
-  sign_in_link_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  sign_in_link_->set_listener(this);
-  layout->AddView(sign_in_link_);
+  account_chooser_link_ = new views::Link();
+  account_chooser_link_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
+  account_chooser_link_->set_listener(this);
+  layout->AddView(account_chooser_link_);
 
-  layout->StartRow(0, single_column_set);
-  notification_area_ = new NotificationArea();
+  layout->StartRowWithPadding(0, single_column_set,
+                              0, views::kRelatedControlVerticalSpacing);
+  notification_area_ = new NotificationArea(account_chooser_link_);
   layout->AddView(notification_area_);
 
   layout->StartRowWithPadding(0, single_column_set,
                               0, views::kUnrelatedControlVerticalSpacing);
   layout->AddView(CreateDetailsContainer());
   return main_container_;
 }
 
 views::View* AutofillDialogViews::CreateDetailsContainer() {
   views::View* view = new views::View();
@@ skipping 279 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