Remove sundry IsModeMaterial checks.

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 <X11/Xcursor/Xcursor.h>
 #include <set>
@@ skipping 22 matching lines @@
 #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
 #include "chrome/browser/ui/libgtk2ui/unity_service.h"
 #include "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/x/x11_types.h"
@@ skipping 167 matching lines @@
 
 // Prefix for app indicator ids
 const char kAppIndicatorIdPrefix[] = "chrome_app_indicator_";
 
 // Number of app indicators used (used as part of app-indicator id).
 int indicators_count;
 
 // The unknown content type.
 const char* kUnknownContentType = "application/octet-stream";
 
-// Values used as the new luminance and saturation values in the inactive tab
-// text color.
-const double kInactiveLuminance = 0.15;
-const double kInactiveSaturation = 0.3;
-
 // TODO(erg): ThemeService has a whole interface just for reading default
 // constants. Figure out what to do with that more long term; for now, just
 // copy the constants themselves here.
 //
 // Default tints.
 const color_utils::HSL kDefaultTintFrameIncognito = { -1, 0.2f, 0.35f };
 const color_utils::HSL kDefaultTintFrameIncognitoInactive = { -1, 0.3f, 0.6f };
 
 #if GTK_MAJOR_VERSION == 3
 const color_utils::HSL kDefaultTintFrameInactive = { -1, -1, 0.75f };
@@ skipping 214 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();
-}
-
 bool Gtk2UI::GetTint(int id, color_utils::HSL* tint) const {
   switch (id) {
     // Tints for which the cross-platform default is fine. Before adding new
     // values here, specifically verify they work well on Linux.
     case ThemeProperties::TINT_BACKGROUND_TAB:
     // TODO(estade): Return something useful for TINT_BUTTONS so that chrome://
     // page icons are colored appropriately.
     case ThemeProperties::TINT_BUTTONS:
       break;
     default:
@@ skipping 334 matching lines @@
       theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
 
   colors_[ThemeProperties::COLOR_CONTROL_BACKGROUND] = toolbar_color;
   colors_[ThemeProperties::COLOR_TOOLBAR] = toolbar_color;
 
   colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] =
       color_utils::DeriveDefaultIconColor(label_color);
 
   colors_[ThemeProperties::COLOR_TAB_TEXT] = label_color;
   colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = label_color;
+  colors_[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] =
+      color_utils::BlendTowardOppositeLuma(label_color, 50);
 
   UpdateDefaultFont();
 
   // Build the various icon tints.
   GetNormalButtonTintHSL(&button_tint_);
   GetNormalEntryForegroundHSL(&entry_tint_);
   GetSelectedEntryForegroundHSL(&selected_entry_tint_);
 
-  // The inactive frame color never occurs naturally in the theme, as it is a
-  // tinted version of the normal 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);
-
   // 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);
   SkColor ntp_foreground =
@@ skipping 59 matching lines @@
                nullptr);
 
   if (theme)
     XcursorSetTheme(gfx::GetXDisplay(), theme);
   if (size)
     XcursorSetDefaultSize(gfx::GetXDisplay(), size);
 
   g_free(theme);
 }
 
-void Gtk2UI::UpdateMaterialDesignColors() {
-  // TODO(varkha): This should be merged back into LoadGtkValues() once Material
-  // Design is on unconditionally.
-  // Early return when Material Design Controller is not initialized yet. This
-  // is harmless and the colors will get updated when this method is called
-  // again after the initialization. See http://crbug.com/622234.
-  if (!ui::MaterialDesignController::is_mode_initialized() ||
-      !ui::MaterialDesignController::IsModeMaterial()) {
-    return;
-  }
-  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);
-}
-
 void Gtk2UI::BuildFrameColors() {
 #if GTK_MAJOR_VERSION == 2
   NativeThemeGtk2* theme = NativeThemeGtk2::instance();
   color_utils::HSL kDefaultFrameShift = { -1, -1, 0.4 };
   SkColor frame_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_WindowBackground);
   frame_color = color_utils::HSLShift(frame_color, kDefaultFrameShift);
   theme->GetChromeStyleColor("frame-color", &frame_color);
   colors_[ThemeProperties::COLOR_FRAME] = frame_color;
 
@@ skipping 147 matching lines @@
   if (pango_font_description_get_style(desc) == PANGO_STYLE_ITALIC)
     query.style |= gfx::Font::ITALIC;
 
   default_font_render_params_ =
       gfx::GetFontRenderParams(query, &default_font_family_);
   default_font_style_ = query.style;
 }
 
 void Gtk2UI::ResetStyle() {
   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 (display::Display::HasForceDeviceScaleFactor())
     return display::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;
 }