Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1116)

Unified Diff: chrome/browser/ui/libgtkui/gtk_util.cc

Issue 2628043002: Gtk3: Render a GtkHeaderBar as the background of the tab strip (Closed)
Patch Set: Guard kFrameTopArea with #if defined(OS_LINUX) && !defined(OS_CHROMEOS) Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/libgtkui/gtk_util.h ('k') | chrome/browser/ui/libgtkui/native_theme_gtk3.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtkui/gtk_util.cc
diff --git a/chrome/browser/ui/libgtkui/gtk_util.cc b/chrome/browser/ui/libgtkui/gtk_util.cc
index 9ecf876fe03e9672633d11624fdecca5d55cf7b7..5ccff758036b931e854ae4b1c7b0131e31353047 100644
--- a/chrome/browser/ui/libgtkui/gtk_util.cc
+++ b/chrome/browser/ui/libgtkui/gtk_util.cc
@@ -65,6 +65,12 @@ void* GetGtk3SharedLibrary() {
namespace libgtkui {
+// 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.
+const color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2f, 0.35f};
+const color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3f, 0.6f};
+
// Theme colors returned by GetSystemColor().
const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
const SkColor kURLTextColor = SkColorSetRGB(0x0b, 0x80, 0x43);
@@ -421,11 +427,13 @@ class PixelSurface {
cairo_t* cairo_;
};
-void RenderBackground(cairo_t* cr, GtkStyleContext* context) {
+void RenderBackground(const gfx::Size& size,
+ cairo_t* cr,
+ GtkStyleContext* context) {
if (!context)
return;
- RenderBackground(cr, gtk_style_context_get_parent(context));
- gtk_render_background(context, cr, 0, 0, 1, 1);
+ RenderBackground(size, cr, gtk_style_context_get_parent(context));
+ gtk_render_background(context, cr, 0, 0, size.width(), size.height());
}
SkColor GetBgColor(const char* css_selector) {
@@ -438,7 +446,7 @@ SkColor GetBgColor(const char* css_selector) {
auto context = GetStyleContextFromCss(css_selector);
RemoveBorders(context);
PixelSurface surface;
- RenderBackground(surface.cairo(), context);
+ RenderBackground(gfx::Size(1, 1), surface.cairo(), context);
return surface.GetPixelValue();
}
@@ -460,7 +468,7 @@ SkColor GetBorderColor(const char* css_selector) {
AddBorders(context);
PixelSurface surface;
- RenderBackground(surface.cairo(), context);
+ RenderBackground(gfx::Size(1, 1), surface.cairo(), context);
gtk_render_frame(context, surface.cairo(), 0, 0, 1, 1);
return surface.GetPixelValue();
}
« no previous file with comments | « chrome/browser/ui/libgtkui/gtk_util.h ('k') | chrome/browser/ui/libgtkui/native_theme_gtk3.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698