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

ui/views/controls/combobox/native_combobox_win.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_win.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_theme_win.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/native_combobox_views.h"
 #include "ui/views/widget/widget.h"
 
-namespace views {
+namespace {
 
 // Limit how small a combobox can be.
-static const int kMinComboboxWidth = 148;
+const int kMinComboboxWidth = 148;
 
 // Add a couple extra pixels to the widths of comboboxes and combobox
 // dropdowns so that text isn't too crowded.
-static const int kComboboxExtraPaddingX = 6;
+const int kComboboxExtraPaddingX = 6;
+
+}  // namespace
+
+namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWin, public:
 
 NativeComboboxWin::NativeComboboxWin(Combobox* combobox)
     : combobox_(combobox),
       content_width_(0) {
   // Associates the actual HWND with the combobox so it is the one considered as
   // having the focus (not the wrapper) when the HWND is focused directly (with
   // a click for example).
   set_focus_view(combobox);
 }
 
 NativeComboboxWin::~NativeComboboxWin() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWin, NativeComboboxWrapper implementation:
 
 void NativeComboboxWin::UpdateFromModel() {
   SendMessage(native_view(), CB_RESETCONTENT, 0, 0);
-  gfx::Font font = ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont);
+  const gfx::Font& font = Combobox::GetFont();
   int max_width = 0;
   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
     // text is displayed correctly in right-to-left UIs.
     base::i18n::AdjustStringForLocaleDirection(&text);
 
     SendMessage(native_view(), CB_ADDSTRING, 0,
@@ skipping 128 matching lines @@
 void NativeComboboxWin::NativeControlCreated(HWND native_control) {
   NativeControlWin::NativeControlCreated(native_control);
 
   UpdateFont();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWin, private:
 
 void NativeComboboxWin::UpdateFont() {
-  HFONT font = ResourceBundle::GetSharedInstance().
-      GetFont(ResourceBundle::BaseFont).GetNativeFont();
+  HFONT font = Combobox::GetFont().GetNativeFont();
   SendMessage(native_view(), WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWrapper, public:
 
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   if (Widget::IsPureViews())
     return new NativeComboboxViews(combobox);
   return new NativeComboboxWin(combobox);
 }
 
 }  // namespace views