Edit button makes username editable in the password manager bubble.

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 "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
@@ skipping 251 matching lines @@
 void ManagePasswordsBubbleView::AutoSigninView::OnTimer() {
   parent_->model()->OnAutoSignInToastTimeout();
   parent_->CloseBubble();
 }
 
 // ManagePasswordsBubbleView::PendingView -------------------------------------
 
 // A view offering the user the ability to save credentials. Contains a
 // single ManagePasswordItemsView, along with a "Save Passwords" button,
 // a "Never" button and an "Edit" button to edit username field.
-class ManagePasswordsBubbleView::PendingView : public views::View,
-                                               public views::ButtonListener {
+class ManagePasswordsBubbleView::PendingView
+    : public views::View,
+      public views::ButtonListener,
+      public ManagePasswordItemsView::ManagePasswordItemsDelegate {
  public:
   explicit PendingView(ManagePasswordsBubbleView* parent);
   ~PendingView() override;
 
  private:
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
+  // ManagePasswordItemsView::ManagePasswordItemsDelegate:
+  void FocusedOnEditable() override;
+  void FocusLostOnEditable() override;
+
   ManagePasswordsBubbleView* parent_;
 
   views::Button* edit_button_;
   views::Button* save_button_;
   views::Button* never_button_;
+  ManagePasswordItemsView* manage_password_items_view_;
 
   DISALLOW_COPY_AND_ASSIGN(PendingView);
 };
 
 ManagePasswordsBubbleView::PendingView::PendingView(
     ManagePasswordsBubbleView* parent)
-    : parent_(parent), edit_button_(nullptr) {
+    : parent_(parent),
+      edit_button_(nullptr),
+      manage_password_items_view_(nullptr) {
   views::GridLayout* layout = new views::GridLayout(this);
   layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
   SetLayoutManager(layout);
 
-  // Create the pending credential item, save button and refusal combobox.
-  ManagePasswordItemsView* item = nullptr;
+  // Create the pending credential item, edit button, save button and refusal
+  // combobox.
   if (!parent->model()->pending_password().username_value.empty()) {

[vasilii, 2017/06/30 15:28:07]

Actually if it's empty then we should allow to edit it. So if your feature is
enabled we should execute this block.

-    item = new ManagePasswordItemsView(parent_->model(),
-                                       &parent->model()->pending_password());
+    manage_password_items_view_ = new ManagePasswordItemsView(
+        parent_->model(), &parent->model()->pending_password(), this);
   }
   if (base::FeatureList::IsEnabled(
           password_manager::features::kEnableUsernameCorrection)) {
+    edit_button_ = views::MdTextButton::CreateSecondaryUiButton(

[vasilii, 2017/06/30 15:28:07]

Broken merge?

[irmakk, 2017/07/03 14:56:54]

Broken merge.

+        this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_EDIT_BUTTON));
+  }
+  if (base::FeatureList::IsEnabled(
+          password_manager::features::kEnableUsernameCorrection)) {
     edit_button_ = views::MdTextButton::CreateSecondaryUiButton(
         this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_EDIT_BUTTON));
   }
   save_button_ = views::MdTextButton::CreateSecondaryUiBlueButton(
       this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SAVE_BUTTON));
   never_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this,
       l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BUBBLE_BLACKLIST_BUTTON));
 
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
 
   // Credential row.
-  if (item) {
+  if (manage_password_items_view_) {
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
-    layout->AddView(item);
+    layout->AddView(manage_password_items_view_);
     layout->AddPaddingRow(0,
                           ChromeLayoutProvider::Get()
                               ->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS)
                               .bottom());
   }
 
   // Button row.
   ColumnSetType column_set_type =
       edit_button_ ? TRIPLE_BUTTON_COLUMN_SET : DOUBLE_BUTTON_COLUMN_SET;
   BuildColumnSet(layout, column_set_type);
   layout->StartRow(0, column_set_type);
   if (column_set_type == TRIPLE_BUTTON_COLUMN_SET) {
     layout->AddView(edit_button_);
   }
   layout->AddView(save_button_);
   layout->AddView(never_button_);
 
   parent_->set_initially_focused_view(save_button_);
 }
 
 ManagePasswordsBubbleView::PendingView::~PendingView() {
 }
 
 void ManagePasswordsBubbleView::PendingView::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
   // TODO(https://crbug.com/734965): Implement edit button logic.
   if (sender == edit_button_) {
+    manage_password_items_view_->SetRowStatusForPendingViewRow(
+        ManagePasswordItemsView::RowStatus::EDITING);
+    edit_button_->SetEnabled(false);
     return;
   } else if (sender == save_button_) {
     parent_->model()->OnSaveClicked();
     if (parent_->model()->ReplaceToShowPromotionIfNeeded()) {
       parent_->Refresh();
       return;
     }
   } else if (sender == never_button_) {
     parent_->model()->OnNeverForThisSiteClicked();
   } else {
     NOTREACHED();
   }
 
   parent_->CloseBubble();
 }
 
+void ManagePasswordsBubbleView::PendingView::FocusedOnEditable() {

[vasilii, 2017/06/30 15:28:07]

We don't need this method. We can call SizeToContents when we switch to the
editing mode which only happens on edit click.

+  parent_->SizeToContents();
+}
+
+void ManagePasswordsBubbleView::PendingView::FocusLostOnEditable() {
+  edit_button_->SetEnabled(true);
+  GetFocusManager()->SetFocusedView(save_button_);

[vasilii, 2017/06/30 15:28:07]

What happens if you click something outside of the bubble? Let's say in the
omnibox. Does this code steal the focus from there?

+}
+
 // ManagePasswordsBubbleView::ManageView --------------------------------------
 
 // A view offering the user a list of their currently saved credentials
 // for the current page, along with a "Manage passwords" link and a
 // "Done" button.
 class ManagePasswordsBubbleView::ManageView : public views::View,
                                               public views::ButtonListener,
                                               public views::LinkListener {
  public:
   explicit ManageView(ManagePasswordsBubbleView* parent);
@@ skipping 504 matching lines @@
   } else if (model_.state() ==
              password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE) {
     AddChildView(new DesktopIOSPromotionBubbleView(
         model_.GetProfile(),
         desktop_ios_promotion::PromotionEntryPoint::SAVE_PASSWORD_BUBBLE));
 #endif
   } else {
     AddChildView(new ManageView(this));
   }
 }