Update Mac password generation autofill popup to match latest mocks.

chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc

 // Copyright 2014 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/autofill/password_generation_popup_view_views.h"
 
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_controller.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace autofill {
 
 namespace {
 
 // The amount of whitespace that is present when there is no padding. Used
 // to get the proper spacing in the help section.
 const int kHelpVerticalOffset = 5;
-const int kPasswordSectionHeight = 62;
 
 // Wrapper around just the text portions of the generation UI (password and
 // prompting text).
 class PasswordTextBox : public views::View {
  public:
   PasswordTextBox() {}
   virtual ~PasswordTextBox() {}
 
   // |suggestion_text| prompts the user to select the password,
   // |generated_password| is the generated password, and |font_list| is the font
@@ skipping 127 matching lines @@
   password_view_->SetPosition(gfx::Point(kPopupBorderThickness,
                                          kPopupBorderThickness));
   password_view_->SizeToPreferredSize();
   AddChildView(password_view_);
 }
 
 gfx::Size PasswordGenerationPopupViewViews::GetPreferredSizeOfPasswordView() {
   int height = kPopupBorderThickness;
   if (controller_->display_password()) {
     // Add divider height as well.
-    height += kPasswordSectionHeight + 1;
+    height +=
+        PasswordGenerationPopupController::kPopupPasswordSectionHeight + 1;
   }
   int width = controller_->GetMinimumWidth();
   int popup_width = width - 2 * kPopupBorderThickness;
   height += help_label_->GetHeightForWidth(popup_width);
   return gfx::Size(width, height + kPopupBorderThickness);
 }
 
 void PasswordGenerationPopupViewViews::Show() {
   DoShow();
 }
@@ skipping 23 matching lines @@
 void PasswordGenerationPopupViewViews::Layout() {
   // Need to leave room for the border.
   int y = kPopupBorderThickness;
   int popup_width = bounds().width() - 2 * kPopupBorderThickness;
   if (controller_->display_password()) {
     // Currently the UI can change from not offering a password to offering
     // a password (e.g. the user is editing a generated password and deletes
     // it), but it can't change the other way around.
     CreatePasswordView();
     password_view_->SetBounds(
-        kPopupBorderThickness, y, popup_width, kPasswordSectionHeight);
+        kPopupBorderThickness,
+        y,
+        popup_width,
+        PasswordGenerationPopupController::kPopupPasswordSectionHeight);
     divider_bounds_ =
         gfx::Rect(kPopupBorderThickness, password_view_->bounds().bottom(),
                   popup_width, 1);
     y = divider_bounds_.bottom();
   }
 
   help_label_->SetBounds(kPopupBorderThickness, y, popup_width,
                          help_label_->GetHeightForWidth(popup_width));
 }
 
@@ skipping 30 matching lines @@
 
   // If the top level widget can't be found, cancel the popup since we can't
   // fully set it up.
   if (!observing_widget)
     return NULL;
 
   return new PasswordGenerationPopupViewViews(controller, observing_widget);
 }
 
 }  // namespace autofill