Password bubble: get rid of hardcodeded sizes for username and password.

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 "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))
-          .GetPreferredSize()
-          .width());
-}
-
-int SecondFieldWidth() {
-  return std::max(
-      ManagePasswordsBubbleModel::PasswordFieldWidth(),
-      views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO))
-          .GetPreferredSize()
-          .width());
-}
-
-enum ColumnSets { TWO_COLUMN_SET = 0, THREE_COLUMN_SET };
+enum ColumnSets {
+  TWO_COLUMN_SET,
+  THREE_COLUMN_SET
+};
 
 void 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,
+                        2,
+                        views::GridLayout::USE_PREF,
                         0,
-                        views::GridLayout::FIXED,
-                        FirstFieldWidth(),
-                        FirstFieldWidth());

[Mike West, 2014/09/16 15:20:42]

Hrm. How does this end up looking? I'm worried about spacing in the UI. Can you
put a screenshot up?

+                        0);
 
   // The password/"Undo!" field.
   column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
-                        SecondFieldWidth(),
-                        SecondFieldWidth());
+                        0,
+                        0);
 
   // 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 143 matching lines @@
 
 void ManagePasswordItemView::UndoView::LinkClicked(views::Link* sender,
                                                    int event_flags) {
   DCHECK_EQ(undo_link_, sender);
   parent_->NotifyClickedUndo();
 }
 
 // ManagePasswordItemView
 ManagePasswordItemView::ManagePasswordItemView(
     ManagePasswordsBubbleModel* manage_passwords_bubble_model,
-    autofill::PasswordForm password_form,
+    const 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);
 
   // 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.
@@ skipping 36 matching lines @@
     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);
 }