chromeos: Remove CROS_FONTS_USING_BCI.

This was a #define that was added when we were deciding
whether we should use the bytecode interpreter or FreeType's
autohinter when rendering UI text on Chrome OS.  The text
had different heights depending on which setting was used,
so a bunch of constants were special-cased when BCI was
enabled.  We've been using the autohinter for a long time,
and we'll need to update lots of newer code if we decide to
switch to BCI someday.

BUG=none
TEST=UI text looks the same as before
TBR=tony@chromium.org,davemoore@chromium.org,zork@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10828336

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151928 0039d316-1c4b-4281-b951-d872f2087c98

build/build_config.h

@@ -142,12 +142,6 @@
 #define WCHAR_T_IS_UNSIGNED 0
 #endif
 
-#if defined(OS_CHROMEOS)
-// Single define to trigger whether CrOS fonts have BCI on.
-// In that case font sizes/deltas should be adjusted.
-//define CROS_FONTS_USING_BCI
-#endif
-
 #if defined(OS_ANDROID)
 // The compiler thinks std::string::const_iterator and "const char*" are
 // equivalent types.

chrome/browser/chromeos/input_method/candidate_window.cc

@@ -61,11 +61,7 @@ const SkColor kInfolistTitleBackgroundColor = SkColorSetRGB(0xdd, 0xdd, 0xdd);
 
 // We'll use a bigger font size, so Chinese characters are more readable
 // in the candidate window.
-#if defined(CROS_FONTS_USING_BCI)
-const int kFontSizeDelta = 1;
-#else
 const int kFontSizeDelta = 2;
-#endif
 
 // Currently the infolist window only supports Japanese font.
 #if defined(GOOGLE_CHROME_BUILD)

chrome/browser/chromeos/login/helper.h

@@ -82,21 +82,12 @@ const int kUserCornerRadius = 6;
 }  // namespace login
 
 // Font size correction in pixels for login/oobe controls.
-#if defined(CROS_FONTS_USING_BCI)
-const int kFontSizeCorrectionDelta = 1;
-const int kNetworkSelectionLabelFontDelta = 1;
-const int kSelectedUsernameFontDelta = 1;
-const int kUnselectedUsernameFontDelta = 1;
-const int kWelcomeTitleFontDelta = 8;
-const int kLoginTitleFontDelta = 3;
-#else
 const int kFontSizeCorrectionDelta = 2;
 const int kNetworkSelectionLabelFontDelta = 1;
 const int kSelectedUsernameFontDelta = 1;
 const int kUnselectedUsernameFontDelta = 2;
 const int kWelcomeTitleFontDelta = 9;
 const int kLoginTitleFontDelta = 4;
-#endif
 
 }  // namespace chromeos
 

chrome/browser/ui/views/extensions/bundle_installed_bubble.cc

@@ -33,11 +33,7 @@ const int kColumnSetId = 0;
 const int kLeftColumnWidth = 325;
 
 // Heading font size correction.
-#if defined(CROS_FONTS_USING_BCI)
-const int kHeadingFontSizeDelta = 0;
-#else
 const int kHeadingFontSizeDelta = 1;
-#endif
 
 class BundleInstalledBubble : public views::BubbleDelegateView,
                               public views::ButtonListener {

chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

@@ -57,11 +57,7 @@ const int kNoPermissionsLeftColumnWidth = 200;
 const int kBundleLeftColumnWidth = 300;
 
 // Heading font size correction.
-#if defined(CROS_FONTS_USING_BCI)
-const int kHeadingFontSizeDelta = 0;
-#else
 const int kHeadingFontSizeDelta = 1;
-#endif
 
 const int kRatingFontSizeDelta = -1;
 

chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

@@ -23,11 +23,7 @@ typedef MediaGalleriesDialogController::KnownGalleryPermissions
 namespace {
 
 // Heading font size correction.
-#if defined(CROS_FONTS_USING_BCI)
-const int kHeadingFontSizeDelta = 0;
-#else
 const int kHeadingFontSizeDelta = 1;
-#endif
 
 const int kContentWidth = 450;
 

chrome/browser/ui/views/sad_tab_view.cc

@@ -41,13 +41,8 @@ const SkColor kKillColor = SkColorSetRGB(57, 48, 88);
 const char kCategoryTagCrash[] = "Crash";
 
 // Font size correction.
-#if defined(CROS_FONTS_USING_BCI)
-const int kTitleFontSizeDelta = 1;
-const int kMessageFontSizeDelta = 0;
-#else
 const int kTitleFontSizeDelta = 2;
 const int kMessageFontSizeDelta = 1;
-#endif
 
 // Name of the experiment to run.
 const char kExperiment[] = "LowMemoryMargin";

ui/base/resource/resource_bundle.cc

@@ -35,15 +35,9 @@ namespace ui {
 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
 
 // Returns the actual scale factor of |bitmap| given the image representations
 // which have already been added to |image|.