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

ui/views/controls/combobox/native_combobox_views.cc

Index: ui/views/controls/combobox/native_combobox_views.cc
diff --git a/ui/views/controls/combobox/native_combobox_views.cc b/ui/views/controls/combobox/native_combobox_views.cc
index 95fb42890f813fcf11b535550a62fc86f324e1d7..a6e14710cf8a2d4bb067af0065fda4112661ddf0 100644
--- a/ui/views/controls/combobox/native_combobox_views.cc
+++ b/ui/views/controls/combobox/native_combobox_views.cc
@@ -160,7 +160,7 @@ void NativeComboboxViews::OnBlur() {
 
 void NativeComboboxViews::UpdateFromModel() {
   int max_width = 0;
-  const gfx::Font &font = GetFont();
+  const gfx::Font& font = Combobox::GetFont();
 
   MenuItemView* menu = new MenuItemView(this);
   // MenuRunner owns |menu|.
@@ -268,11 +268,6 @@ bool NativeComboboxViews::GetAccelerator(int id, ui::Accelerator* accel) {
 /////////////////////////////////////////////////////////////////
 // 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));
 }
@@ -296,7 +291,7 @@ void NativeComboboxViews::PaintText(gfx::Canvas* canvas) {
   int disclosure_arrow_offset = width() - disclosure_arrow_->width()
       - kDisclosureArrowLeftPadding - kDisclosureArrowRightPadding;
 
-  const gfx::Font& font = GetFont();
+  const gfx::Font& font = Combobox::GetFont();
   int text_width = font.GetStringWidth(text);
   if ((text_width + insets.width()) > disclosure_arrow_offset)
     text_width = disclosure_arrow_offset - insets.width();