diff options
| -rw-r--r-- | app/resource_bundle.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc index 6d8829d..4cbd35e 100644 --- a/app/resource_bundle.cc +++ b/app/resource_bundle.cc @@ -145,21 +145,12 @@ void ResourceBundle::LoadFontsIfNecessary() { AutoLock lock_scope(lock_); if (!base_font_.get()) { base_font_.reset(new gfx::Font()); -#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) - // Toolkit views needs a less gigantor base font to more correctly match - // metrics for the bitmap-based UI. - *base_font_ = base_font_->DeriveFont(-1); -#endif small_font_.reset(new gfx::Font()); *small_font_ = base_font_->DeriveFont(-2); medium_font_.reset(new gfx::Font()); -#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) - *medium_font_ = base_font_->DeriveFont(2); -#else *medium_font_ = base_font_->DeriveFont(3); -#endif medium_bold_font_.reset(new gfx::Font()); *medium_bold_font_ = diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 5ed809e..9f0097e 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -98,7 +98,12 @@ const int kRowRightPadding = 3; const int kIconTextSpacing = 9; // The size delta between the font used for the edit and the result rows. Passed // to gfx::Font::DeriveFont. +#if !defined(OS_CHROMEOS) const int kEditFontAdjust = -1; +#else +// Don't adjust font on chromeos as it becomes too small. +const int kEditFontAdjust = 0; +#endif } |