ChromeFont->gfx::Font...

views/controls/combo_box.cc

 // Copyright (c) 2006-2008 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 "views/controls/combo_box.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 97 matching lines @@
   }
   return 0;
 }
 
 LRESULT ComboBox::OnNotify(int w_param, LPNMHDR l_param) {
   return 0;
 }
 
 void ComboBox::UpdateComboBoxFromModel(HWND hwnd) {
   ::SendMessage(hwnd, CB_RESETCONTENT, 0, 0);
-  ChromeFont font = ResourceBundle::GetSharedInstance().GetFont(
+  gfx::Font font = ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont);
   int max_width = 0;
   int num_items = model_->GetItemCount(this);
   for (int i = 0; i < num_items; ++i) {
     const std::wstring& text = model_->GetItemAt(this, i);
 
     // Inserting the Unicode formatting characters if necessary so that the
     // text is displayed correctly in right-to-left UIs.
     std::wstring localized_text;
     const wchar_t* text_ptr = text.c_str();
@@ skipping 41 matching lines @@
   // ComboBox::Model can be safely searched for and selected (which is what
   // CB_SELECTSTRING does).
   ::SendMessage(hwnd, CB_SETCURSEL, selected_item_, 0);
 }
 
 int ComboBox::GetSelectedItem() {
   return selected_item_;
 }
 
 }  // namespace views