diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 21:14:03 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 21:14:03 +0000 |
| commit | c3217be503d6aeb920dc55f7c9a3f731ac63e3bd (patch) | |
| tree | e5bbb3bad6e7abb6e14f98322f38c712ec4dbb1b /skia | |
| parent | cd2920af211d2ba926381c80b853a2e1d3eef3bc (diff) | |
| download | chromium_src-c3217be503d6aeb920dc55f7c9a3f731ac63e3bd.zip chromium_src-c3217be503d6aeb920dc55f7c9a3f731ac63e3bd.tar.gz chromium_src-c3217be503d6aeb920dc55f7c9a3f731ac63e3bd.tar.bz2 | |
Make infobar background gray
Currently page action infobars are blue on Windows and Linux and yellow on Mac. This change makes it gray on all platforms.
Screenshots:
http://www.dropmocks.com/mVNOW
Also see this CL:
http://codereview.chromium.org/7031069/
BUG=80432
TEST=Ran on Mac and Linux. Windows pending.
Review URL: http://codereview.chromium.org/7130001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/skia_utils_mac.h | 5 | ||||
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index fb9a66d..737db95 100644 --- a/skia/ext/skia_utils_mac.h +++ b/skia/ext/skia_utils_mac.h @@ -26,9 +26,11 @@ typedef struct _NSSize NSSize; #ifdef __OBJC__ @class NSImage; @class NSImageRep; +@class NSColor; #else class NSImage; class NSImageRep; +class NSColor; #endif namespace gfx { @@ -62,6 +64,9 @@ SkColor CGColorRefToSkColor(CGColorRef color); // Converts ARGB to CGColorRef. CGColorRef SkColorToCGColorRef(SkColor color); +// Converts ARGB to NSColor. +NSColor* SkColorToCalibratedNSColor(SkColor color); + // Converts a CGImage to a SkBitmap. SkBitmap CGImageToSkBitmap(CGImageRef image); diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index 3c955bb..1ef5322 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -186,6 +186,14 @@ CGColorRef SkColorToCGColorRef(SkColor color) { SkColorGetA(color) / 255.0); } +// Converts ARGB to NSColor. +NSColor* SkColorToCalibratedNSColor(SkColor color) { + return [NSColor colorWithCalibratedRed:SkColorGetR(color) / 255.0 + green:SkColorGetG(color) / 255.0 + blue:SkColorGetB(color) / 255.0 + alpha:SkColorGetA(color) / 255.0]; +} + SkBitmap CGImageToSkBitmap(CGImageRef image) { if (!image) return SkBitmap(); |