Adding skeleton code for showing Bubble, asking user to submit URL when Password Manager fails

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

 // Copyright 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/views/passwords/manage_passwords_bubble_view.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
+#include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
-

[vabr (Chromium), 2014/12/03 14:08:06]

nit: As a general rule, formatting changes not related to the rest of the CL
should be kept out of the CL. The goal is to keep the CL as small and focussed
as possible. Please revert removing of the 4 blank lines in this file.

(Whether 1 or 2 blank lines are better on this place is not completely clear
(the style is not strict, and whether 1 or 2 help readability is subjective). I
would avoid the need to discuss this together with your main change by just not
changing it in this CL. :))

[melandory, 2014/12/04 10:33:47]

Done.

 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 const int kDesiredBubbleWidth = 370;
 
 enum ColumnSetType {
   // | | (FILL, FILL) | |
   // Used for the bubble's header, the credentials list, and for simple
   // messages like "No passwords".
@@ skipping 65 matching lines @@
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             1,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
   }
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
 }
 
+// Given |layout| and |color| adds border with |color| using
+// SINGLE_VIEW_COLUMN_SET.
+void AddBorderRow(views::GridLayout* layout, SkColor color) {
+  layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET, 0,
+                              views::kRelatedControlVerticalSpacing);
+  views::Separator* border = new views::Separator(views::Separator::HORIZONTAL);
+  border->SetColor(color);
+  layout->AddView(border);
+}
+
 // Given a layout and a model, add an appropriate title using a
 // SINGLE_VIEW_COLUMN_SET, followed by a spacer row.
 void AddTitleRow(views::GridLayout* layout, ManagePasswordsBubbleModel* model) {
   views::Label* title_label = new views::Label(model->title());
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_label->SetMultiLine(true);
   title_label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::MediumFont));
 
   // Add the title to the layout with appropriate padding.
   layout->StartRowWithPadding(
       0, SINGLE_VIEW_COLUMN_SET, 0, views::kRelatedControlSmallVerticalSpacing);
   layout->AddView(title_label);
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 }
 
+// Given a |layout| and |text|, adds a text row with small font using a
+// SINGLE_VIEW_COLUMN_SET.
+void AddTextRow(views::GridLayout* layout, const base::string16& text) {
+  views::Label* text_label = new views::Label(text);
+  text_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  text_label->SetMultiLine(true);
+  text_label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
+      ui::ResourceBundle::SmallFont));
+  layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
+  layout->AddView(text_label);
+}
+
 }  // namespace
 
 
 // Globals --------------------------------------------------------------------
 
 namespace chrome {
 
 void ShowManagePasswordsBubble(content::WebContents* web_contents) {
   if (ManagePasswordsBubbleView::IsShowing()) {
     // The bubble is currently shown for some other tab. We should close it now
@@ skipping 87 matching lines @@
     // ManagePasswordsBubbleModel should care about calling a callback in case
     // the bubble is dismissed by any other means.
     CredentialsItemView* view = static_cast<CredentialsItemView*>(sender);
     parent_->model()->OnChooseCredentials(view->form());
   } else {
     parent_->model()->OnNopeClicked();
   }
   parent_->Close();
 }
 
+// ManagePasswordsBubbleView::AskUserToSubmitURLView -------------------------
+
+// Asks users if they want to report the URL when the password manager failed
+// to detect the form. View has following structure:
+// We detected that Chrome password manager failed to handle this URL.
+// Do you want to send this URL to Google to improve Chrome?
+// -------------------------------------------------------------
+// https://strangesite.com/
+// -------------------------------------------------------------
+//                                  [Send URL]            [Nope]
+class ManagePasswordsBubbleView::AskUserToSubmitURLView
+    : public views::View,
+      public views::ButtonListener {
+ public:
+  explicit AskUserToSubmitURLView(ManagePasswordsBubbleView* parent);
+  ~AskUserToSubmitURLView() override;
+
+ private:
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+
+  ManagePasswordsBubbleView* parent_;
+
+  views::BlueButton* send_button_;
+  views::BlueButton* no_button_;
+};
+
+ManagePasswordsBubbleView::AskUserToSubmitURLView::AskUserToSubmitURLView(
+    ManagePasswordsBubbleView* parent)
+    : parent_(parent) {
+  views::GridLayout* layout = new views::GridLayout(this);
+  layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
+  SetLayoutManager(layout);
+
+  send_button_ = new views::BlueButton(
+      this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_CANCEL_BUTTON));
+  send_button_->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
+      ui::ResourceBundle::SmallFont));
+
+  no_button_ = new views::BlueButton(
+      this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SEND_URL_BUTTON));
+  no_button_->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
+      ui::ResourceBundle::SmallFont));
+
+  // Title row.
+  BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
+  AddTitleRow(layout, parent_->model());
+  // Confirmation text.
+  AddTextRow(layout, l10n_util::GetStringUTF16(
+                         IDS_MANAGE_PASSWORDS_ASK_TO_SUBMIT_URL_TEXT));
+  GURL origin = parent->model()->origin();
+  // Better to omit url if it's incorrect or empty.

[vabr (Chromium), 2014/12/03 14:08:07]

But what is the purpose of asking the user, if they want to report the origin,
if we cannot show it? The bubble should not show up, unless there is an origin
to show to the user.

[melandory, 2014/12/04 10:33:47]

Moved this check to  PasswordManager::RecordFailure when condition for should we
show bubble or not is checked.

Done.

+  if (origin.is_valid() && !origin.is_empty() && origin.has_host()) {
+    // Border row.
+    SkColor color = GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor);
+    AddBorderRow(layout, color);
+    layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
+    // URL row.
+    AddTextRow(layout, base::UTF8ToUTF16(parent->model()->origin().host()));
+    layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
+    // Border row.
+    AddBorderRow(layout, color);
+  }
+  // Button row.
+  BuildColumnSet(layout, DOUBLE_BUTTON_COLUMN_SET);
+  layout->StartRowWithPadding(0, DOUBLE_BUTTON_COLUMN_SET, 0,
+                              views::kRelatedControlVerticalSpacing);
+  layout->AddView(no_button_);
+  layout->AddView(send_button_);
+
+  // Extra padding for visual awesomeness.
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+
+  parent_->set_initially_focused_view(send_button_);

[vabr (Chromium), 2014/12/03 14:08:06]

Please make sure that the choice of the default was agreed upon by sabineb@.
Sending the URL is a privacy sensitive action, so we need to be careful with the
default choices.

[melandory, 2014/12/04 10:33:47]

sabineb@ said that nope as default is better.
Done.

+}
+
+ManagePasswordsBubbleView::AskUserToSubmitURLView::~AskUserToSubmitURLView() {
+}
+
+void ManagePasswordsBubbleView::AskUserToSubmitURLView::ButtonPressed(
+    views::Button* sender,
+    const ui::Event& event) {
+  DCHECK(sender == send_button_ || sender == no_button_);
+  // TODO(melandory): Add actions on button clicks: url reporting, pref saving.
+  parent_->Close();
+}
+
 // ManagePasswordsBubbleView::PendingView -------------------------------------
 
 // A view offering the user the ability to save credentials. Contains a
 // single ManagePasswordItemsView, along with a "Save Passwords" button
 // and a rejection combobox.
 class ManagePasswordsBubbleView::PendingView : public views::View,
                                                public views::ButtonListener,
                                                public views::ComboboxListener {
  public:
   explicit PendingView(ManagePasswordsBubbleView* parent);
@@ skipping 506 matching lines @@
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
 // static
 void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
                                            DisplayReason reason) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   DCHECK(browser);
   DCHECK(browser->window());
   DCHECK(browser->fullscreen_controller());
-
   if (IsShowing())
     return;
-
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   bool is_fullscreen = browser_view->IsFullscreen();
   ManagePasswordsIconView* anchor_view =
       is_fullscreen
           ? NULL
           : browser_view->GetLocationBarView()->manage_passwords_icon_view();
   manage_passwords_bubble_ = new ManagePasswordsBubbleView(
       web_contents, anchor_view, reason);
 
   if (is_fullscreen) {
@@ skipping 88 matching lines @@
 }
 
 void ManagePasswordsBubbleView::Refresh() {
   RemoveAllChildViews(true);
   initially_focused_view_ = NULL;
   if (password_manager::ui::IsPendingState(model()->state())) {
     if (never_save_passwords_)
       AddChildView(new ConfirmNeverView(this));
     else
       AddChildView(new PendingView(this));
+  } else if (IsAskSubmitURLState(model()->state())) {
+    AddChildView(new AskUserToSubmitURLView(this));
   } else if (model()->state() == password_manager::ui::BLACKLIST_STATE) {
     AddChildView(new BlacklistedView(this));
   } else if (model()->state() == password_manager::ui::CONFIRMATION_STATE) {
     AddChildView(new SaveConfirmationView(this));
   } else if (password_manager::ui::IsCredentialsState(model()->state())) {
     AddChildView(new AccountChooserView(this));
   } else {
     AddChildView(new ManageView(this));
   }
   GetLayoutManager()->Layout(this);
@@ skipping 15 matching lines @@
 }
 
 void ManagePasswordsBubbleView::NotifyUndoNeverForThisSite() {
   never_save_passwords_ = false;
   Refresh();
 }
 
 void ManagePasswordsBubbleView::Init() {
   views::FillLayout* layout = new views::FillLayout();
   SetLayoutManager(layout);
-
   Refresh();
 }
 
 void ManagePasswordsBubbleView::WindowClosing() {
   // Close() closes the window asynchronously, so by the time we reach here,
   // |manage_passwords_bubble_| may have already been reset.
   if (manage_passwords_bubble_ == this)
     manage_passwords_bubble_ = NULL;
 }
 
 views::View* ManagePasswordsBubbleView::GetInitiallyFocusedView() {
   return initially_focused_view_;
 }
 
 void ManagePasswordsBubbleView::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_FULLSCREEN_CHANGED);
   GetWidget()->SetVisibilityAnimationTransition(views::Widget::ANIMATE_NONE);
   CloseBubble();
 }