Gtk3: Render a GtkHeaderBar as the background of the tab strip

chrome/browser/ui/libgtkui/gtk_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/libgtkui/gtk_ui.h"
 
 #include <math.h>
 #include <pango/pango.h>
 #include <X11/Xcursor/Xcursor.h>
 
@@ skipping 218 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";
 
-// 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};
-#if GTK_MAJOR_VERSION == 2
-const color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3f, 0.6f};
-#endif
-
 // Picks a button tint from a set of background colors. While
 // |accent_color| will usually be the same color through a theme, this
 // function will get called with the normal GtkLabel |text_color|/GtkWindow
 // |background_color| pair and the GtkEntry |text_color|/|background_color|
 // pair. While 3/4 of the time the resulting tint will be the same, themes that
 // have a dark window background (with light text) and a light text entry (with
 // dark text) will get better icons with this separated out.
 void PickButtonTintFromColors(SkColor accent_color,
                               SkColor text_color,
                               SkColor background_color,
@@ skipping 643 matching lines @@
   if (theme)
     XcursorSetTheme(gfx::GetXDisplay(), theme);
   if (size)
     XcursorSetDefaultSize(gfx::GetXDisplay(), size);
 
   g_free(theme);
 }
 
 void GtkUi::BuildFrameColors() {
 #if GTK_MAJOR_VERSION == 2
-  color_utils::HSL kDefaultFrameShift = {-1, -1, 0.4};
+  const color_utils::HSL kDefaultFrameShift = {-1, -1, 0.4};
   SkColor frame_color =
       native_theme_->GetSystemColor(ui::NativeTheme::kColorId_WindowBackground);
   frame_color = color_utils::HSLShift(frame_color, kDefaultFrameShift);
   GetChromeStyleColor("frame-color", &frame_color);
   colors_[ThemeProperties::COLOR_FRAME] = frame_color;
 
   GtkStyle* style = gtk_rc_get_style(fake_window_);
   SkColor temp_color = color_utils::HSLShift(
       GdkColorToSkColor(style->bg[GTK_STATE_INSENSITIVE]), kDefaultFrameShift);
   GetChromeStyleColor("inactive-frame-color", &temp_color);
   colors_[ThemeProperties::COLOR_FRAME_INACTIVE] = temp_color;
 
   temp_color = color_utils::HSLShift(frame_color, kDefaultTintFrameIncognito);
   GetChromeStyleColor("incognito-frame-color", &temp_color);
   colors_[ThemeProperties::COLOR_FRAME_INCOGNITO] = temp_color;
 
   temp_color =
       color_utils::HSLShift(frame_color, kDefaultTintFrameIncognitoInactive);
   GetChromeStyleColor("incognito-inactive-frame-color", &temp_color);
   colors_[ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE] = temp_color;
 #else
-  // TODO(thomasanderson): Render a GtkHeaderBar directly.
   SkColor color_frame = GetBgColor("#headerbar.header-bar.titlebar");
   SkColor color_frame_inactive =
       GetBgColor("#headerbar.header-bar.titlebar:backdrop");
   colors_[ThemeProperties::COLOR_FRAME] = color_frame;
   colors_[ThemeProperties::COLOR_FRAME_INACTIVE] = color_frame_inactive;
   colors_[ThemeProperties::COLOR_FRAME_INCOGNITO] =
       color_utils::HSLShift(color_frame, kDefaultTintFrameIncognito);
   colors_[ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE] =
       color_utils::HSLShift(color_frame_inactive, kDefaultTintFrameIncognito);
 #endif
@@ skipping 108 matching lines @@
 
 float GtkUi::GetDeviceScaleFactor() const {
   return device_scale_factor_;
 }
 
 }  // namespace libgtkui
 
 views::LinuxUI* BuildGtkUi() {
   return new libgtkui::GtkUi;
 }