Revert of Makes MaterialDesignController initialization explicit

chrome/browser/ui/libgtk2ui/gtk2_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 
 #include <math.h>
 #include <pango/pango.h>
 #include <set>
 #include <utility>
@@ skipping 498 matching lines @@
   // We must build this after GTK gets initialized.
   gconf_listener_.reset(new GConfListener(this));
 #endif  // defined(USE_GCONF)
 
   indicators_count = 0;
 
   // Instantiate the singleton instance of Gtk2EventLoop.
   Gtk2EventLoop::GetInstance();
 }
 
-void Gtk2UI::MaterialDesignControllerReady() {
-  UpdateMaterialDesignColors();
-}
-
 Gtk2UI::~Gtk2UI() {
   ClearAllThemeData();
 }
 
 gfx::Image Gtk2UI::GetThemeImageNamed(int id) const {
   // Try to get our cached version:
   ImageCache::const_iterator it = gtk_images_.find(id);
   if (it != gtk_images_.end())
     return it->second;
 
@@ skipping 365 matching lines @@
   colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = label_color;
 
   UpdateDefaultFont();
 
   // Build the various icon tints.
   GetNormalButtonTintHSL(&button_tint_);
   GetNormalEntryForegroundHSL(&entry_tint_);
   GetSelectedEntryForegroundHSL(&selected_entry_tint_);
   SkColor frame_color = BuildFrameColors();
 
-  // The inactive frame color never occurs naturally in the theme, as it is a
-  // tinted version of |frame_color|. We generate another color based on the
-  // background tab color, with the lightness and saturation moved in the
-  // opposite direction. (We don't touch the hue, since there should be subtle
-  // hints of the color in the text.)
-  color_utils::HSL inactive_tab_text_hsl;
-  color_utils::SkColorToHSL(
-      theme->GetSystemColor(ui::NativeTheme::kColorId_WindowBackground),
-      &inactive_tab_text_hsl);
-  inactive_tab_text_hsl.s = kInactiveLuminance;
-  inactive_tab_text_hsl.l = kInactiveSaturation;
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    colors_[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] =
+        color_utils::BlendTowardOppositeLuma(label_color, 50);
+  } else {
+    // The inactive frame color never occurs naturally in the theme, as it is a
+    // tinted version of |frame_color|. We generate another color based on the
+    // background tab color, with the lightness and saturation moved in the
+    // opposite direction. (We don't touch the hue, since there should be subtle
+    // hints of the color in the text.)
+    color_utils::HSL inactive_tab_text_hsl;
+    color_utils::SkColorToHSL(
+        theme->GetSystemColor(ui::NativeTheme::kColorId_WindowBackground),
+        &inactive_tab_text_hsl);
+    inactive_tab_text_hsl.s = kInactiveLuminance;
+    inactive_tab_text_hsl.l = kInactiveSaturation;
 
-  colors_[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] =
-      color_utils::HSLToSkColor(inactive_tab_text_hsl, 255);
+    colors_[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] =
+        color_utils::HSLToSkColor(inactive_tab_text_hsl, 255);
+  }
 
   // We pick the text and background colors for the NTP out of the colors for a
   // GtkEntry. We do this because GtkEntries background color is never the same
   // as |toolbar_color|, is usually a white, and when it isn't a white,
   // provides sufficient contrast to |toolbar_color|. Try this out with
   // Darklooks, HighContrastInverse or ThinIce.
 
   SkColor ntp_background =
       theme->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldDefaultBackground);
@@ skipping 40 matching lines @@
   inactive_selection_fg_color_ =
       theme->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldReadOnlyColor);
 
   colors_[ThemeProperties::COLOR_TAB_THROBBER_SPINNING] =
       theme->GetSystemColor(ui::NativeTheme::kColorId_ThrobberSpinningColor);
   colors_[ThemeProperties::COLOR_TAB_THROBBER_WAITING] =
       theme->GetSystemColor(ui::NativeTheme::kColorId_ThrobberWaitingColor);
 }
 
-void Gtk2UI::UpdateMaterialDesignColors() {
-  // TODO(varkha): This should be merged back into LoadGtkValues() once Material
-  // Design is on unconditionally.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    NativeThemeGtk2* theme = NativeThemeGtk2::instance();
-    SkColor label_color =
-        theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
-    colors_[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] =
-        color_utils::BlendTowardOppositeLuma(label_color, 50);
-  }
-}
-
 SkColor Gtk2UI::BuildFrameColors() {
   NativeThemeGtk2* theme = NativeThemeGtk2::instance();
   SkColor frame_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_WindowBackground);
   SkColor temp_color;
 
 #if GTK_MAJOR_VERSION == 2
   color_utils::HSL kDefaultFrameShift = { -1, -1, 0.4 };
   GtkStyle* style = gtk_rc_get_style(theme->GetWindow());
 
@@ skipping 360 matching lines @@
     query.style |= gfx::Font::ITALIC;
 
   default_font_render_params_ =
       gfx::GetFontRenderParams(query, &default_font_family_);
   default_font_style_ = query.style;
 }
 
 void Gtk2UI::ResetStyle() {
   ClearAllThemeData();
   LoadGtkValues();
-  // TODO(varkha): There will be no need to call UpdateMaterialDesignColors()
-  // once Material Design is on unconditionally.
-  UpdateMaterialDesignColors();
   NativeThemeGtk2::instance()->NotifyObservers();
 }
 
 void Gtk2UI::UpdateDeviceScaleFactor(float device_scale_factor) {
   device_scale_factor_ = device_scale_factor;
   UpdateDefaultFont();
 }
 
 float Gtk2UI::GetDeviceScaleFactor() const {
   if (gfx::Display::HasForceDeviceScaleFactor())
     return gfx::Display::GetForcedDeviceScaleFactor();
   const int kCSSDefaultDPI = 96;
   const float scale = GetDPI() / kCSSDefaultDPI;
 
   // Blacklist scaling factors <130% (crbug.com/484400) and round
   // to 1 decimal to prevent rendering problems (crbug.com/485183).
   return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10;
 }
 
 }  // namespace libgtk2ui
 
 views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }