ChromeFont->gfx::Font...

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2009 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/views/location_bar_view.h"
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
@@ skipping 654 matching lines @@
       views::Border::CreateEmptyBorder(kTopInset, kLeftInset, kBottomInset,
                                        kRightInset));
   partial_label_.set_border(
       views::Border::CreateEmptyBorder(kTopInset, kLeftInset, kBottomInset,
                                        kRightInset));
 }
 
 LocationBarView::SelectedKeywordView::~SelectedKeywordView() {
 }
 
-void LocationBarView::SelectedKeywordView::SetFont(const ChromeFont& font) {
+void LocationBarView::SelectedKeywordView::SetFont(const gfx::Font& font) {
   full_label_.SetFont(font);
   partial_label_.SetFont(font);
 }
 
 void LocationBarView::SelectedKeywordView::Paint(ChromeCanvas* canvas) {
   canvas->TranslateInt(0, kBackgroundYOffset);
   background_painter_.Paint(width(), height() - kTopInset, canvas);
   canvas->TranslateInt(0, -kBackgroundYOffset);
 }
 
@@ skipping 70 matching lines @@
   }
 }
 
 LocationBarView::KeywordHintView::~KeywordHintView() {
   // Labels are freed by us. Remove them so that View doesn't
   // try to free them too.
   RemoveChildView(&leading_label_);
   RemoveChildView(&trailing_label_);
 }
 
-void LocationBarView::KeywordHintView::SetFont(const ChromeFont& font) {
+void LocationBarView::KeywordHintView::SetFont(const gfx::Font& font) {
   leading_label_.SetFont(font);
   trailing_label_.SetFont(font);
 }
 
 void LocationBarView::KeywordHintView::SetColor(const SkColor& color) {
   leading_label_.SetColor(color);
   trailing_label_.SetColor(color);
 }
 
 void LocationBarView::KeywordHintView::SetKeyword(const std::wstring& keyword) {
@@ skipping 429 matching lines @@
   location_entry_->SetFocus();
 }
 
 void LocationBarView::SaveStateToContents(TabContents* contents) {
   location_entry_->SaveStateToTab(contents);
 }
 
 void LocationBarView::Revert() {
   location_entry_->RevertAll();
 }