views: Refactor the way we get the combo box font.

ui/views/controls/combobox/native_combobox_views.cc

 // Copyright (c) 2012 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 "ui/views/controls/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 30 matching lines @@
 const int kDisclosureArrowRightPadding = 7;
 
 // Color settings for text and border.
 // These are tentative, and should be derived from theme, system
 // settings and current settings.
 const SkColor kTextColor = SK_ColorBLACK;
 
 // Define the id of the first item in the menu (since it needs to be > 0)
 const int kFirstMenuItemId = 1000;
 
+const gfx::Font& GetFont() {

[sky, 2012/03/23 15:36:38]

Maybe we should promote this to combobox so that both places care share the
code.

+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  return rb.GetFont(ui::ResourceBundle::BaseFont);
+}
+
 }  // namespace
 
 namespace views {
 
 const char NativeComboboxViews::kViewClassName[] =
     "views/NativeComboboxViews";
 
 NativeComboboxViews::NativeComboboxViews(Combobox* parent)
     : combobox_(parent),
       text_border_(new FocusableBorder()),
@@ skipping 92 matching lines @@
 
 void NativeComboboxViews::OnBlur() {
   NOTREACHED();
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeComboboxViews, NativeComboboxWrapper overrides:
 
 void NativeComboboxViews::UpdateFromModel() {
   int max_width = 0;
-  const gfx::Font &font = GetFont();
+  const gfx::Font& font = GetFont();
 
   MenuItemView* menu = new MenuItemView(this);
   // MenuRunner owns |menu|.
   dropdown_list_menu_runner_.reset(new MenuRunner(menu));
 
   int num_items = combobox_->model()->GetItemCount();
   for (int i = 0; i < num_items; ++i) {
     string16 text = combobox_->model()->GetItemAt(i);
 
     // Inserting the Unicode formatting characters if necessary so that the
@@ skipping 87 matching lines @@
   SchedulePaint();
 }
 
 bool NativeComboboxViews::GetAccelerator(int id, ui::Accelerator* accel) {
   return false;
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeComboboxViews private methods:
 
-const gfx::Font& NativeComboboxViews::GetFont() const {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  return rb.GetFont(ResourceBundle::BaseFont);
-}
-
 void NativeComboboxViews::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(GetMirroredXForRect(*rect));
 }
 
 void NativeComboboxViews::PaintText(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
 
   canvas->Save();
   canvas->ClipRect(GetContentsBounds());
 
@@ skipping 70 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxViews(combobox);
 }
 #endif
 
 }  // namespace views