Clean up ManagePasswordsBubbleView and ManagePasswordItemView.

chrome/browser/ui/views/passwords/manage_password_item_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_item_view.h"
 
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/password_manager/core/common/password_manager_ui.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/border.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"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
 namespace {
 
 int FirstFieldWidth() {
   return std::max(
       ManagePasswordsBubbleModel::UsernameFieldWidth(),
       views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED))
@@ skipping 57 matching lines @@
   views::Label* label = new views::Label(form.password_value);
   label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::SmallFont));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SetObscured(true);
   return label;
 }
 
 }  // namespace
 
-// Pending View
+// Render credentials in two columns: username and password.
+class ManagePasswordItemView::PendingView : public views::View {
+ public:
+  explicit PendingView(ManagePasswordItemView* parent);
+
+ private:
+  virtual ~PendingView() {}

[vabr (Chromium), 2014/09/02 13:29:28]

Please do not inline the destructors in the classes newly added to this .cc, see
http://dev.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-Stop-in....
The only destructors fine to inline are in classes in which all (incl.
inherited) data members are POD (plain old data, like int, etc.).

[vasilii, 2014/09/02 15:33:33]

Done.

+};
+
 ManagePasswordItemView::PendingView::PendingView(
     ManagePasswordItemView* parent) {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   BuildColumnSet(layout, TWO_COLUMN_SET);
   layout->StartRowWithPadding(
       0, TWO_COLUMN_SET, 0, views::kRelatedControlVerticalSpacing);
   layout->AddView(GenerateUsernameLabel(parent->password_form_));
   layout->AddView(GeneratePasswordLabel(parent->password_form_));
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 }
 
-ManagePasswordItemView::PendingView::~PendingView() {
-}
+// Render credentials in three columns: username, password, and delete.
+class ManagePasswordItemView::ManageView : public views::View,
+                                           public views::ButtonListener {
+ public:
+  explicit ManageView(ManagePasswordItemView* parent);
 
-// Manage View
+ private:
+  virtual ~ManageView() {}
+
+  // views::ButtonListener:
+  virtual void ButtonPressed(views::Button* sender,
+                             const ui::Event& event) OVERRIDE;
+
+  views::ImageButton* delete_button_;
+  ManagePasswordItemView* parent_;
+};
+
 ManagePasswordItemView::ManageView::ManageView(ManagePasswordItemView* parent)
     : parent_(parent) {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   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());
 
   BuildColumnSet(layout, THREE_COLUMN_SET);
   layout->StartRowWithPadding(
       0, THREE_COLUMN_SET, 0, views::kRelatedControlVerticalSpacing);
   layout->AddView(GenerateUsernameLabel(parent->password_form_));
   layout->AddView(GeneratePasswordLabel(parent->password_form_));
   layout->AddView(delete_button_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 }
 
 void ManagePasswordItemView::ManageView::ButtonPressed(views::Button* sender,
                                                        const ui::Event& event) {
   DCHECK_EQ(delete_button_, sender);
   parent_->NotifyClickedDelete();
 }
 
-ManagePasswordItemView::ManageView::~ManageView() {
-}
+// Render a notification to the user that a password has been removed, and
+// offer an undo link.
+class ManagePasswordItemView::UndoView : public views::View,
+                                         public views::LinkListener {
+ public:
+  explicit UndoView(ManagePasswordItemView* parent);
 
-// Undo View
+ private:
+  virtual ~UndoView() {}
+
+  // views::LinkListener:
+  virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
+
+  views::Link* undo_link_;
+  ManagePasswordItemView* parent_;
+};
+
 ManagePasswordItemView::UndoView::UndoView(ManagePasswordItemView* parent)
     : parent_(parent) {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   views::Label* text =
       new views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED));
   text->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   text->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::SmallFont));
@@ skipping 13 matching lines @@
   layout->AddView(undo_link_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 }
 
 void ManagePasswordItemView::UndoView::LinkClicked(views::Link* sender,
                                                    int event_flags) {
   DCHECK_EQ(undo_link_, sender);
   parent_->NotifyClickedUndo();
 }
 
-ManagePasswordItemView::UndoView::~UndoView() {
-}
-
 // ManagePasswordItemView
 ManagePasswordItemView::ManagePasswordItemView(
     ManagePasswordsBubbleModel* manage_passwords_bubble_model,
     autofill::PasswordForm password_form,
     password_manager::ui::PasswordItemPosition position)
     : model_(manage_passwords_bubble_model),
       password_form_(password_form),
       delete_password_(false) {
   views::FillLayout* layout = new views::FillLayout();
   SetLayoutManager(layout);
@@ skipping 13 matching lines @@
     AddChildView(new PendingView(this));
   } else {
     AddChildView(new ManageView(this));
   }
   GetLayoutManager()->Layout(this);
 }
 
 ManagePasswordItemView::~ManagePasswordItemView() {
 }
 
+void ManagePasswordItemView::NotifyClickedDelete() {
+  delete_password_ = true;
+  Refresh();
+}
+
+void ManagePasswordItemView::NotifyClickedUndo() {
+  delete_password_ = false;
+  Refresh();
+}
+
 void ManagePasswordItemView::Refresh() {
   DCHECK(!password_manager::ui::IsPendingState(model_->state()));
 
   RemoveAllChildViews(true);
   if (delete_password_)
     AddChildView(new UndoView(this));
   else
     AddChildView(new ManageView(this));
   GetLayoutManager()->Layout(this);
 
   // 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_,
                            delete_password_
                                ? ManagePasswordsBubbleModel::REMOVE_PASSWORD
                                : ManagePasswordsBubbleModel::ADD_PASSWORD);
 }
-
-void ManagePasswordItemView::NotifyClickedDelete() {
-  delete_password_ = true;
-  Refresh();
-}
-
-void ManagePasswordItemView::NotifyClickedUndo() {
-  delete_password_ = false;
-  Refresh();
-}