[Password Generation] Trigger confirmation bubble when a password is saved

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/browser_window.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_item_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/text_utils.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/styled_label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
 
 // 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".
   SINGLE_VIEW_COLUMN_SET = 0,
 
   // | | (TRAILING, CENTER) | | (TRAILING, CENTER) | |
   // Used for buttons at the bottom of the bubble which should nest at the
   // bottom-right corner.
   DOUBLE_BUTTON_COLUMN_SET = 1,
 
   // | | (LEADING, CENTER) | | (TRAILING, CENTER) | |
   // Used for buttons at the bottom of the bubble which should occupy
   // the corners.
   LINK_BUTTON_COLUMN_SET = 2,
+
+  // | | (TRAILING, CENTER) | |
+  // Used when there is only one button which should next at the bottom-right
+  // corner.
+  SINGLE_BUTTON_COLUMN_SET = 3,
 };
 
 // Construct an appropriate ColumnSet for the given |type|, and add it
 // to |layout|.
 void BuildColumnSet(views::GridLayout* layout, ColumnSetType type) {
   views::ColumnSet* column_set = layout->AddColumnSet(type);
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
   int full_width = kDesiredBubbleWidth - (2 * views::kPanelHorizMargin);
   switch (type) {
     case SINGLE_VIEW_COLUMN_SET:
@@ skipping 28 matching lines @@
                             0,
                             0);
       column_set->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
       column_set->AddColumn(views::GridLayout::TRAILING,
                             views::GridLayout::CENTER,
                             0,
                             views::GridLayout::USE_PREF,
                             0,
                             0);
       break;
+    case SINGLE_BUTTON_COLUMN_SET:
+      column_set->AddColumn(views::GridLayout::TRAILING,
+                            views::GridLayout::CENTER,
+                            1,
+                            views::GridLayout::USE_PREF,
+                            0,
+                            0);
   }
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
 }
 
 // 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);
@@ skipping 12 matching lines @@
 
 // Globals --------------------------------------------------------------------
 
 namespace chrome {
 
 void ShowManagePasswordsBubble(content::WebContents* web_contents) {
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
   ManagePasswordsBubbleView::ShowBubble(
       web_contents,
-      controller->state() ==
-              password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE
+      password_manager::ui::IsAutomaticDisplayState(controller->state())
           ? ManagePasswordsBubbleView::AUTOMATIC
           : ManagePasswordsBubbleView::USER_ACTION);
 }
 
 }  // namespace chrome
 
 
 // ManagePasswordsBubbleView::PendingView -------------------------------------
 
 ManagePasswordsBubbleView::PendingView::PendingView(
@@ skipping 145 matching lines @@
   SetLayoutManager(layout);
 
   // Add the title.
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRow(layout, parent_->model());
 
   // If we have a list of passwords to store for the current site, display
   // them to the user for management. Otherwise, render a "No passwords for
   // this site" message.
   if (!parent_->model()->best_matches().empty()) {
-    for (autofill::PasswordFormMap::const_iterator i(
+    for (autofill::ConstPasswordFormMap::const_iterator i(
              parent_->model()->best_matches().begin());
          i != parent_->model()->best_matches().end();
          ++i) {
       ManagePasswordItemView* item = new ManagePasswordItemView(
           parent_->model(),
           *i->second,
           i == parent_->model()->best_matches().begin()
               ? ManagePasswordItemView::FIRST_ITEM
               : ManagePasswordItemView::SUBSEQUENT_ITEM);
 
@@ skipping 109 matching lines @@
     const ui::Event& event) {
   if (sender == done_button_)
     parent_->model()->OnDoneClicked();
   else if (sender == unblacklist_button_)
     parent_->model()->OnUnblacklistClicked();
   else
     NOTREACHED();
   parent_->Close();
 }
 
+// ManagePasswordsBubbleView::SaveConfirmationView ----------------------------
+
+ManagePasswordsBubbleView::SaveConfirmationView::SaveConfirmationView(
+    ManagePasswordsBubbleView* parent)
+    : parent_(parent) {
+  views::GridLayout* layout = new views::GridLayout(this);
+  layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
+  SetLayoutManager(layout);
+
+  BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
+  AddTitleRow(layout, parent_->model());
+
+  views::StyledLabel* confirmation =
+      new views::StyledLabel(parent_->model()->save_confirmation_text(), this);
+  confirmation->SetBaseFontList(
+      ui::ResourceBundle::GetSharedInstance().GetFontList(
+          ui::ResourceBundle::SmallFont));
+  confirmation->AddStyleRange(
+      parent_->model()->save_confirmation_link_range(),
+      views::StyledLabel::RangeStyleInfo::CreateForLink());
+
+  layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
+  layout->AddView(confirmation);
+
+  ok_button_ =
+      new views::LabelButton(this, l10n_util::GetStringUTF16(IDS_OK));
+  ok_button_->SetStyle(views::Button::STYLE_BUTTON);
+  ok_button_->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
+      ui::ResourceBundle::SmallFont));
+
+  BuildColumnSet(layout, SINGLE_BUTTON_COLUMN_SET);
+  layout->StartRowWithPadding(
+      0, SINGLE_BUTTON_COLUMN_SET, 0, views::kRelatedControlVerticalSpacing);
+  layout->AddView(ok_button_);
+
+  // Extra padding for visual awesomeness.
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+}
+
+ManagePasswordsBubbleView::SaveConfirmationView::~SaveConfirmationView() {
+}
+
+void ManagePasswordsBubbleView::SaveConfirmationView::StyledLabelLinkClicked(
+    const gfx::Range& range, int event_flags) {
+  DCHECK_EQ(range, parent_->model()->save_confirmation_link_range());
+  parent_->model()->OnRemoteManageLinkClicked();
+  parent_->Close();
+}
+
+void ManagePasswordsBubbleView::SaveConfirmationView::ButtonPressed(
+    views::Button* sender, const ui::Event& event) {
+  DCHECK_EQ(sender, ok_button_);
+  parent_->model()->OnOKClicked();
+  parent_->Close();
+}
+
 // ManagePasswordsBubbleView --------------------------------------------------
 
 // static
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
 // static
 void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
                                            DisplayReason reason) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
@@ skipping 99 matching lines @@
 
 void ManagePasswordsBubbleView::Refresh() {
   RemoveAllChildViews(true);
   if (password_manager::ui::IsPendingState(model()->state())) {
     if (never_save_passwords_)
       AddChildView(new ConfirmNeverView(this));
     else
       AddChildView(new PendingView(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 {
     AddChildView(new ManageView(this));
   }
   GetLayoutManager()->Layout(this);
 }
 
 void ManagePasswordsBubbleView::NotifyNeverForThisSiteClicked() {
   if (model()->best_matches().empty()) {
     // Skip confirmation if there are no existing passwords for this site.
     NotifyConfirmedNeverForThisSite();
   } else {
     never_save_passwords_ = true;
     Refresh();
   }
 }
 
 void ManagePasswordsBubbleView::NotifyConfirmedNeverForThisSite() {
   model()->OnNeverForThisSiteClicked();
   Close();
 }
 
 void ManagePasswordsBubbleView::NotifyUndoNeverForThisSite() {
   never_save_passwords_ = false;
   Refresh();
 }