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

Unified Diff: ui/base/cocoa/controls/blue_label_button.mm

Issue 1508893003: Use proper namespace in skia/ext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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 | « ui/base/clipboard/clipboard_mac.mm ('k') | ui/gfx/image/image_skia_util_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/controls/blue_label_button.mm
diff --git a/ui/base/cocoa/controls/blue_label_button.mm b/ui/base/cocoa/controls/blue_label_button.mm
index 319fff85a54fb51fcb4a35c48bf87f2e48156876..9d9b5805c9ca7c1c471751f2e58ead5f265c7059 100644
--- a/ui/base/cocoa/controls/blue_label_button.mm
+++ b/ui/base/cocoa/controls/blue_label_button.mm
@@ -63,7 +63,7 @@ const SkColor kPressOuterRingColor = SkColorSetRGB(0x23, 0x52, 0xa2);
base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
[shadow setShadowOffset:NSMakeSize(0, -1)];
[shadow setShadowBlurRadius:0];
- [shadow setShadowColor:gfx::SkColorToSRGBNSColor(kTextShadowColor)];
+ [shadow setShadowColor:skia::SkColorToSRGBNSColor(kTextShadowColor)];
NSDictionary* buttonTextAttributes = @{
NSParagraphStyleAttributeName : buttonTextParagraphStyle,
@@ -112,24 +112,24 @@ const SkColor kPressOuterRingColor = SkColorSetRGB(0x23, 0x52, 0xa2);
frame.size.height -= 1;
if (hoverState == kHoverStateMouseDown && [self isHighlighted]) {
- centerColor = gfx::SkColorToSRGBNSColor(kPressedColor);
- innerColor = gfx::SkColorToSRGBNSColor(kPressInnerRingColor);
- outerColor = gfx::SkColorToSRGBNSColor(kPressOuterRingColor);
+ centerColor = skia::SkColorToSRGBNSColor(kPressedColor);
+ innerColor = skia::SkColorToSRGBNSColor(kPressInnerRingColor);
+ outerColor = skia::SkColorToSRGBNSColor(kPressOuterRingColor);
} else {
centerColor = hoverState == kHoverStateMouseOver ?
- gfx::SkColorToSRGBNSColor(kHoverColor) :
- gfx::SkColorToSRGBNSColor(kDefaultColor);
+ skia::SkColorToSRGBNSColor(kHoverColor) :
+ skia::SkColorToSRGBNSColor(kDefaultColor);
innerColor = [self showsFirstResponder] ?
- gfx::SkColorToSRGBNSColor(kFocusInnerRingColor) :
- gfx::SkColorToSRGBNSColor(kInnerRingColor);
- outerColor = gfx::SkColorToSRGBNSColor(kOuterRingColor);
+ skia::SkColorToSRGBNSColor(kFocusInnerRingColor) :
+ skia::SkColorToSRGBNSColor(kInnerRingColor);
+ outerColor = skia::SkColorToSRGBNSColor(kOuterRingColor);
}
{
gfx::ScopedNSGraphicsContextSaveGState context;
base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
[shadow setShadowOffset:NSMakeSize(0, -1)];
[shadow setShadowBlurRadius:1.0];
- [shadow setShadowColor:gfx::SkColorToSRGBNSColor(kShadowColor)];
+ [shadow setShadowColor:skia::SkColorToSRGBNSColor(kShadowColor)];
[shadow set];
[outerColor set];
« no previous file with comments | « ui/base/clipboard/clipboard_mac.mm ('k') | ui/gfx/image/image_skia_util_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698