Clean-up: Replaces obsolete Font/FontList methods.

chrome/browser/ui/views/passwords/manage_passwords_bubble_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_passwords_bubble_view.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_item_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/canvas.h"
+#include "ui/gfx/text_utils.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 // Updates either the biggest possible width for the username field in the
 // manage passwords bubble or the biggest possible width for the password field.
 void UpdateBiggestWidth(const autofill::PasswordForm& password_form,
                         bool username,
                         int* biggest_width) {
-  ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-  gfx::FontList font_list(rb->GetFontList(ui::ResourceBundle::BaseFont));
+  const gfx::FontList font_list;
   base::string16 display_string(username ?
       password_form.username_value :
       ManagePasswordItemView::GetPasswordDisplayString(
           password_form.password_value));
-  *biggest_width = std::max(
-      gfx::Canvas::GetStringWidth(display_string, font_list), *biggest_width);
+  *biggest_width = std::max(gfx::GetStringWidth(display_string, font_list),
+                            *biggest_width);
 }
 
 }  // namespace
 
 
 // ManagePasswordsBubbleView --------------------------------------------------
 
 // static
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
@@ skipping 102 matching lines @@
 void ManagePasswordsBubbleView::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new GridLayout(this);
   SetLayoutManager(layout);
 
   // This calculates the necessary widths for the list of credentials in the
   // bubble. We do not need to clamp the password field width because
   // ManagePasswordItemView::GetPasswordFisplayString() does this.
 
-  ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   const int predefined_username_field_max_width =
-      rb->GetFont(ui::ResourceBundle::BaseFont).GetAverageCharacterWidth() * 22;
+      gfx::FontList().GetExpectedTextWidth(22);
   const int max_username_or_password_width =
       std::min(GetMaximumUsernameOrPasswordWidth(true),
                predefined_username_field_max_width);
   const int first_field_width = std::max(max_username_or_password_width,
       views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED)).
           GetPreferredSize().width());
 
   const int second_field_width = std::max(
       GetMaximumUsernameOrPasswordWidth(false),
       views::Label(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO)).
           GetPreferredSize().width());
 
   const int kSingleColumnSetId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kSingleColumnSetId);
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
 
+  ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   views::Label* title_label =
       new views::Label(manage_passwords_bubble_model_->title());
   title_label->SetMultiLine(true);
   title_label->SetFontList(rb->GetFontList(ui::ResourceBundle::MediumFont));
 
   layout->StartRowWithPadding(0, kSingleColumnSetId,
                               0, views::kRelatedControlSmallVerticalSpacing);
   layout->AddView(title_label);
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
@@ skipping 158 matching lines @@
       manage_passwords_bubble_model_->manage_passwords_bubble_state() ==
           ManagePasswordsBubbleModel::PASSWORD_TO_BE_SAVED);
   Close();
 }
 
 void ManagePasswordsBubbleView::LinkClicked(views::Link* source,
                                             int event_flags) {
   DCHECK_EQ(source, manage_link_);
   manage_passwords_bubble_model_->OnManageLinkClicked();
 }