Update Confirmation UI for saved password change

chrome/browser/ui/views/passwords/manage_password_items_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_password_items_view.h"
 
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
+#include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"

[vasilii, 2015/06/03 18:32:02]

Remove.

[dvadym, 2015/06/19 15:27:29]

Done.

 #include "chrome/grit/generated_resources.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
@@ skipping 85 matching lines @@
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
   // views::LinkListener:
   void LinkClicked(views::Link* source, int event_flags) override;
 
   void ResetControls();
 
   ManagePasswordItemsView* host_;
   const autofill::PasswordForm* password_form_;
   views::Link* undo_link_;
+  views::Link* update_link_;
   views::ImageButton* delete_button_;
   bool deleted_;
 };
 
 ManagePasswordItemsView::PasswordFormRow::PasswordFormRow(
     ManagePasswordItemsView* host, const autofill::PasswordForm* password_form)
     : host_(host),
       password_form_(password_form),
       undo_link_(nullptr),
       delete_button_(nullptr),
       deleted_(false) {}
 
 void ManagePasswordItemsView::PasswordFormRow::AddRow(
     views::GridLayout* layout) {
   if (deleted_) {
     AddUndoRow(layout);
   } else {
     AddCredentialsRow(layout);
   }
 }
 
 void ManagePasswordItemsView::PasswordFormRow::AddCredentialsRow(
     views::GridLayout* layout) {
   ResetControls();
   int column_set_id =
-      host_->model_->state() == password_manager::ui::PENDING_PASSWORD_STATE
+      host_->model_->state() == password_manager::ui::PENDING_PASSWORD_STATE &&
+              !host_->model_->account_for_update_selection()
           ? TWO_COLUMN_SET
           : THREE_COLUMN_SET;
   BuildColumnSetIfNeeded(layout, column_set_id);
   layout->StartRowWithPadding(0, column_set_id, 0,
                               views::kRelatedControlVerticalSpacing);
   layout->AddView(GenerateUsernameLabel(*password_form_));
   layout->AddView(GeneratePasswordLabel(*password_form_));
   if (column_set_id == THREE_COLUMN_SET) {
-    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-    delete_button_ = new views::ImageButton(this);
-    delete_button_->SetImage(views::ImageButton::STATE_NORMAL,
-                             rb->GetImageNamed(IDR_CLOSE_2).ToImageSkia());
-    delete_button_->SetImage(views::ImageButton::STATE_HOVERED,
-                             rb->GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
-    delete_button_->SetImage(views::ImageButton::STATE_PRESSED,
-                             rb->GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
-    layout->AddView(delete_button_);
+    if (host_->model_->account_for_update_selection()) {
+      update_link_ = new views::Link(
+          l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_UPDATE_LINK));
+      update_link_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
+      update_link_->set_listener(this);
+      update_link_->SetUnderline(false);
+      update_link_->SetFontList(
+          ui::ResourceBundle::GetSharedInstance().GetFontList(
+              ui::ResourceBundle::SmallFont));
+      layout->AddView(update_link_);
+    } else {
+      ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+      delete_button_ = new views::ImageButton(this);
+      delete_button_->SetImage(views::ImageButton::STATE_NORMAL,
+                               rb->GetImageNamed(IDR_CLOSE_2).ToImageSkia());
+      delete_button_->SetImage(views::ImageButton::STATE_HOVERED,
+                               rb->GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
+      delete_button_->SetImage(views::ImageButton::STATE_PRESSED,
+                               rb->GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
+      layout->AddView(delete_button_);
+    }
   }
 }
 
 void ManagePasswordItemsView::PasswordFormRow::AddUndoRow(
     views::GridLayout* layout) {
   ResetControls();
   views::Label* text =
       new views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED));
   text->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   text->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
@@ skipping 14 matching lines @@
 
 void ManagePasswordItemsView::PasswordFormRow::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   DCHECK_EQ(delete_button_, sender);
   deleted_ = true;
   host_->NotifyPasswordFormStatusChanged(*password_form_, deleted_);
 }
 
 void ManagePasswordItemsView::PasswordFormRow::LinkClicked(views::Link* sender,
                                                            int event_flags) {
-  DCHECK_EQ(undo_link_, sender);
-  deleted_ = false;
-  host_->NotifyPasswordFormStatusChanged(*password_form_, deleted_);
+  DCHECK(sender == undo_link_ || sender == update_link_);
+  if (sender == undo_link_) {
+    deleted_ = false;
+    host_->NotifyPasswordFormStatusChanged(*password_form_, deleted_);
+  } else {
+    host_->NotifyAccountForUpdateWasSelected(*password_form_);
+  }
 }
 
 void ManagePasswordItemsView::PasswordFormRow::ResetControls() {
   delete_button_ = nullptr;
   undo_link_ = nullptr;
 }
 
 // ManagePasswordItemsView
 ManagePasswordItemsView::ManagePasswordItemsView(
     ManagePasswordsBubbleModel* manage_passwords_bubble_model,
@@ skipping 21 matching lines @@
     const autofill::PasswordForm& password_form, bool deleted) {
   Refresh();
   // After the view is consistent, notify the model that the password needs to
   // be updated (either removed or put back into the store, as appropriate.
   model_->OnPasswordAction(password_form,
                            deleted
                                ? ManagePasswordsBubbleModel::REMOVE_PASSWORD
                                : ManagePasswordsBubbleModel::ADD_PASSWORD);
 }
 
+void ManagePasswordItemsView::NotifyAccountForUpdateWasSelected(
+    const autofill::PasswordForm& password_form) {
+  model_->OnUpdateClicked(password_form);
+  //  ManagePasswordsBubbleView::CloseBubble(); // todo do we need this?

[vabr (Chromium), 2015/06/03 16:33:26]

Shouldn't this go through the controller?
Also, if you don't use this line, please remove the #includes for
ManagePasswordsBubbleView.

[vasilii, 2015/06/03 18:32:02]

ManagePasswordItemsView definitely shouldn't think about the bubble.

[dvadym, 2015/06/19 15:27:29]

Thanks, I forgot to remove it. Done

+}
+
 void ManagePasswordItemsView::Refresh() {
   DCHECK_NE(password_manager::ui::PENDING_PASSWORD_STATE, model_->state());
   RemoveAllChildViews(true);
   AddRows();
 }