Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6688)

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 142523003: Renames gfx::FontList::Derive* family. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/gtest/filter/ui_unittests_disabled ('k') | ui/app_list/views/speech_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index a741785fa4ad213ee8a119b0ecd8665ad237a71d..3a12bec9706427b8d9128aba1412a406685692b9 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -261,8 +261,10 @@ void LocationBarView::Init() {
ResourceBundle::BaseFont);
const int current_font_size = font_list.GetFontSize();
const int desired_font_size = browser_defaults::kOmniboxFontPixelSize;
- if (current_font_size < desired_font_size)
- font_list = font_list.DeriveFontListWithSize(desired_font_size);
+ if (current_font_size != desired_font_size) {
+ font_list =
+ font_list.DeriveWithSizeDelta(desired_font_size - current_font_size);
+ }
// Shrink large fonts to make them fit.
// TODO(pkasting): Stretch the location bar instead in this case.
const int location_height = GetInternalHeight(true);
« no previous file with comments | « build/android/pylib/gtest/filter/ui_unittests_disabled ('k') | ui/app_list/views/speech_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698