Password bubble: Create subviews for ManagePasswordsBubbleView.

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 "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
+namespace {
+
+enum FieldType { USERNAME_FIELD, PASSWORD_FIELD };
+
+// Upper limit on the size of the username and password fields.
+const int kUsernameFieldSize = 30;
+const int kPasswordFieldSize = 22;
+
+// Returns the width of |type| field.
+int GetFieldWidth(FieldType type) {
+  return ui::ResourceBundle::GetSharedInstance()
+      .GetFontList(ui::ResourceBundle::SmallFont)
+      .GetExpectedTextWidth(type == USERNAME_FIELD ? kUsernameFieldSize
+                                                   : kPasswordFieldSize);
+}
+
+int FirstFieldWidth() {
+  return std::max(
+      GetFieldWidth(USERNAME_FIELD),
+      views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED))
+          .GetPreferredSize()
+          .width());
+}
+
+int SecondFieldWidth() {
+  return std::max(
+      GetFieldWidth(PASSWORD_FIELD),
+      views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO))
+          .GetPreferredSize()
+          .width());
+}
+
+}  // namespace
+
 // Pending View
 ManagePasswordItemView::PendingView::PendingView(
     ManagePasswordItemView* parent) {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   parent->BuildColumnSet(layout, TWO_COLUMN_SET);
   layout->StartRowWithPadding(
       0, TWO_COLUMN_SET, 0, views::kRelatedControlVerticalSpacing);
   layout->AddView(parent->GenerateUsernameLabel());
@@ skipping 64 matching lines @@
   DCHECK_EQ(undo_link_, sender);
   parent_->NotifyClickedUndo();
 }
 
 ManagePasswordItemView::UndoView::~UndoView() {}
 
 // ManagePasswordItemView
 ManagePasswordItemView::ManagePasswordItemView(
     ManagePasswordsBubbleModel* manage_passwords_bubble_model,
     autofill::PasswordForm password_form,
-    int field_1_width,
-    int field_2_width,
     Position position)
     : manage_passwords_bubble_model_(manage_passwords_bubble_model),
       password_form_(password_form),
-      delete_password_(false),
-      field_1_width_(field_1_width),
-      field_2_width_(field_2_width) {
+      delete_password_(false) {
   views::FillLayout* layout = new views::FillLayout();
   SetLayoutManager(layout);
 
   // When a password is displayed as the first item in a list, it has borders
   // on both the top and bottom. When it's in the middle of a list, or at the
   // end, it has a border only on the bottom.
   SetBorder(views::Border::CreateSolidSidedBorder(
       position == FIRST_ITEM ? 1 : 0,
       0,
       1,
@@ skipping 13 matching lines @@
 void ManagePasswordItemView::BuildColumnSet(views::GridLayout* layout,
                                             int column_set_id) {
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
 
   // The username/"Deleted!" field.
   column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         0,
                         views::GridLayout::FIXED,
-                        field_1_width_,
-                        field_1_width_);
+                        FirstFieldWidth(),
+                        FirstFieldWidth());
 
   // The password/"Undo!" field.
   column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
-                        field_2_width_,
-                        field_2_width_);
+                        SecondFieldWidth(),
+                        SecondFieldWidth());
 
   // If we're in manage-mode, we need another column for the delete button.
   if (column_set_id == THREE_COLUMN_SET) {
     column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
     column_set->AddColumn(views::GridLayout::TRAILING,
                           views::GridLayout::FILL,
                           0,
                           views::GridLayout::USE_PREF,
                           0,
                           0);
@@ skipping 38 matching lines @@
 
 void ManagePasswordItemView::NotifyClickedDelete() {
   delete_password_ = true;
   Refresh();
 }
 
 void ManagePasswordItemView::NotifyClickedUndo() {
   delete_password_ = false;
   Refresh();
 }