chrome/browser/ui/gtk/gtk_theme_service.cc - Issue 7748026: content: Reapply "Start splitting up chrome/browser/ui/gtk/gtk_util.h" (r98287)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/gtk_theme_service.cc

Issue 7748026: content: Reapply "Start splitting up chrome/browser/ui/gtk/gtk_util.h" (r98287) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase on Monday. Created 9 years, 4 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

Index: chrome/browser/ui/gtk/gtk_theme_service.cc

diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc

index a3d58dab07dfaf032304ab4f42a4fdfa7d2ace36..cab2f6996c0c2a8e9339e3bd07fb24290d748e34 100644

--- a/chrome/browser/ui/gtk/gtk_theme_service.cc

+++ b/chrome/browser/ui/gtk/gtk_theme_service.cc

@@ -36,6 +36,7 @@

#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/gtk/gtk_hig_constants.h"

#include "ui/base/gtk/gtk_signal_registrar.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/canvas_skia.h"

@@ -238,9 +239,9 @@ void BuildIconFromIDRWithColor(int id,

void GdkColorHSLShift(const color_utils::HSL& shift, GdkColor* frame_color) {

SkColor shifted = color_utils::HSLShift(GdkToSkColor(frame_color), shift);

frame_color->pixel = 0;

- frame_color->red = SkColorGetR(shifted) * kSkiaToGDKMultiplier;

- frame_color->green = SkColorGetG(shifted) * kSkiaToGDKMultiplier;

- frame_color->blue = SkColorGetB(shifted) * kSkiaToGDKMultiplier;

+ frame_color->red = SkColorGetR(shifted) * ui::kSkiaToGDKMultiplier;

+ frame_color->green = SkColorGetG(shifted) * ui::kSkiaToGDKMultiplier;

+ frame_color->blue = SkColorGetB(shifted) * ui::kSkiaToGDKMultiplier;

}

} // namespace

« no previous file with comments | « chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc ('k') | chrome/browser/ui/gtk/gtk_util.h » ('j') | no next file with comments »