diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 18:08:18 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 18:08:18 +0000 |
| commit | 7f1f8e39214e49ea62c3038f886b4df540aadb42 (patch) | |
| tree | 9d10c59a5b01756f58a9e84ee11ce98a0814adba | |
| parent | 89306863d98635acbc50c8e0ec50ebd636c096d0 (diff) | |
| download | chromium_src-7f1f8e39214e49ea62c3038f886b4df540aadb42.zip chromium_src-7f1f8e39214e49ea62c3038f886b4df540aadb42.tar.gz chromium_src-7f1f8e39214e49ea62c3038f886b4df540aadb42.tar.bz2 | |
Adjusts font sizes to be readable on Chrome OS.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/434010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32810 0039d316-1c4b-4281-b951-d872f2087c98
| -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 } |