Clean-up: Replaces obsolete Font/FontList methods.

chrome/browser/ui/autofill/password_generation_popup_controller_impl.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/autofill/password_generation_popup_controller_impl.h"
 
 #include <math.h>
 
 #include "base/strings/utf_string_conversion_utils.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_observer.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/password_generator.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/text_utils.h"
 
 namespace autofill {
 
 const int kMinimumWidth = 60;
 const int kDividerHeight = 1;
 
 base::WeakPtr<PasswordGenerationPopupControllerImpl>
 PasswordGenerationPopupControllerImpl::GetOrCreate(
     base::WeakPtr<PasswordGenerationPopupControllerImpl> previous,
     const gfx::RectF& bounds,
@@ skipping 94 matching lines @@
   web_contents()->GetRenderViewHost()->Send(
       new AutofillMsg_GeneratedPasswordAccepted(
           web_contents()->GetRenderViewHost()->GetRoutingID(),
           current_password_));
   password_manager_->SetFormHasGeneratedPassword(form_);
   Hide();
 }
 
 int PasswordGenerationPopupControllerImpl::GetDesiredWidth() {
   // Minimum width we want to display the password.
-  int minimum_length_for_text = 2 * kHorizontalPadding +
-      font_.GetExpectedTextWidth(kMinimumWidth) +
+  int minimum_length_for_text =
+      2 * kHorizontalPadding +
+      font_list_.GetExpectedTextWidth(kMinimumWidth) +
       2 * kPopupBorderThickness;
 
   // If the width of the field is longer than the minimum, use that instead.
   return std::max(minimum_length_for_text,
                   controller_common_.RoundedElementBounds().width());
 }
 
 int PasswordGenerationPopupControllerImpl::GetDesiredHeight(int width) {
   // Note that this wrapping isn't exactly what the popup will do. It shouldn't
   // line break in the middle of the link, but as long as the link isn't longer
   // than given width this shouldn't affect the height calculated here. The
   // default width should be wide enough to prevent this from being an issue.
-  int total_length = font_.GetStringWidth(HelpText() + LearnMoreLink());
+  int total_length = gfx::GetStringWidth(HelpText() + LearnMoreLink(),
+                                         font_list_);
   int usable_width = width - 2 * kHorizontalPadding;
   int text_height =
       static_cast<int>(ceil(static_cast<double>(total_length)/usable_width)) *
-      font_.GetHeight();
+      font_list_.GetHeight();
   int help_section_height = text_height + 2 * kHelpVerticalPadding;
 
   int password_section_height =
-      font_.GetHeight() + 2 * kPasswordVerticalPadding;
+      font_list_.GetHeight() + 2 * kPasswordVerticalPadding;
 
   return (2 * kPopupBorderThickness +
           help_section_height +
           password_section_height);
 }
 
 void PasswordGenerationPopupControllerImpl::CalculateBounds() {
   int popup_width  = GetDesiredWidth();
   int popup_height = GetDesiredHeight(popup_width);
 
   popup_bounds_ = controller_common_.GetPopupBounds(popup_height, popup_width);
 
   // Calculate the bounds for the rest of the elements given the bounds of
   // the popup.
   password_bounds_ =  gfx::Rect(
       kPopupBorderThickness,
       kPopupBorderThickness,
       popup_bounds_.width() - 2 * kPopupBorderThickness,
-      font_.GetHeight() + 2 * kPasswordVerticalPadding);
+      font_list_.GetHeight() + 2 * kPasswordVerticalPadding);
 
   divider_bounds_ = gfx::Rect(kPopupBorderThickness,
                               password_bounds_.bottom(),
                               password_bounds_.width(),
                               kDividerHeight);
 
   int help_height =
       popup_bounds_.height() - divider_bounds_.bottom() - kPopupBorderThickness;
   help_bounds_ = gfx::Rect(
       kPopupBorderThickness,
@@ skipping 105 matching lines @@
 
 base::string16 PasswordGenerationPopupControllerImpl::HelpText() {
   return l10n_util::GetStringUTF16(IDS_PASSWORD_GENERATION_PROMPT);
 }
 
 base::string16 PasswordGenerationPopupControllerImpl::LearnMoreLink() {
   return l10n_util::GetStringUTF16(IDS_PASSWORD_GENERATION_LEARN_MORE_LINK);
 }
 
 }  // namespace autofill