Adjust default font sizes for new hand hinted fonts.

app/resource_bundle.cc

 // Copyright (c) 2010 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 "app/resource_bundle.h"
 
 #include "base/data_pack.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "build/build_config.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
+namespace {
+
+// Font sizes relative to base font.
+#if defined(OS_CHROMEOS) && defined(CROS_FONTS_USING_BCI)
+const int kSmallFontSizeDelta = -3;
+const int kMediumFontSizeDelta = 2;
+const int kLargeFontSizeDelta = 7;
+#else
+const int kSmallFontSizeDelta = -2;
+const int kMediumFontSizeDelta = 3;
+const int kLargeFontSizeDelta = 8;
+#endif
+
+}  // namespace
+
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 
 /* static */
 // TODO(glen): Finish moving these into theme provider (dialogs still
 //    depend on these colors).
 const SkColor ResourceBundle::frame_color =
      SkColorSetRGB(66, 116, 201);
 const SkColor ResourceBundle::frame_color_inactive =
      SkColorSetRGB(161, 182, 228);
 const SkColor ResourceBundle::frame_color_app_panel =
@@ skipping 142 matching lines @@
 void ResourceBundle::LoadFontsIfNecessary() {
   AutoLock lock_scope(*lock_);
   if (!base_font_.get()) {
     base_font_.reset(new gfx::Font());
 
     bold_font_.reset(new gfx::Font());
     *bold_font_ =
         base_font_->DeriveFont(0, base_font_->GetStyle() | gfx::Font::BOLD);
 
     small_font_.reset(new gfx::Font());
-    *small_font_ = base_font_->DeriveFont(-2);
+    *small_font_ = base_font_->DeriveFont(kSmallFontSizeDelta);
 
     medium_font_.reset(new gfx::Font());
-    *medium_font_ = base_font_->DeriveFont(3);
+    *medium_font_ = base_font_->DeriveFont(kMediumFontSizeDelta);
 
     medium_bold_font_.reset(new gfx::Font());
     *medium_bold_font_ =
-        base_font_->DeriveFont(3, base_font_->GetStyle() | gfx::Font::BOLD);
+        base_font_->DeriveFont(kMediumFontSizeDelta,
+                               base_font_->GetStyle() | gfx::Font::BOLD);
 
     large_font_.reset(new gfx::Font());
-    *large_font_ = base_font_->DeriveFont(8);
+    *large_font_ = base_font_->DeriveFont(kLargeFontSizeDelta);
   }
 }
 
 const gfx::Font& ResourceBundle::GetFont(FontStyle style) {
   LoadFontsIfNecessary();
   switch (style) {
     case BoldFont:
       return *bold_font_;
     case SmallFont:
       return *small_font_;
@@ skipping 38 matching lines @@
 
 bool ResourceBundle::LoadedDataPack::GetStringPiece(
     int resource_id, base::StringPiece* data) const {
   return data_pack_->GetStringPiece(static_cast<uint32>(resource_id), data);
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory(
     int resource_id) const {
   return data_pack_->GetStaticMemory(resource_id);
 }