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

Unified Diff: ui/app_list/cocoa/apps_search_results_controller.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/app_list/cocoa/apps_grid_view_item.mm ('k') | ui/base/clipboard/clipboard_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/cocoa/apps_search_results_controller.mm
diff --git a/ui/app_list/cocoa/apps_search_results_controller.mm b/ui/app_list/cocoa/apps_search_results_controller.mm
index 304eb066c064221c29fdf7cc77dbdd2c95ae02bb..41155f22c94750fcd37fa3b505062a7902eede06 100644
--- a/ui/app_list/cocoa/apps_search_results_controller.mm
+++ b/ui/app_list/cocoa/apps_search_results_controller.mm
@@ -137,8 +137,8 @@ const SkColor kSelectedRowColor = SkColorSetRGB(0xE6, 0xE6, 0xE6);
[tableView_ setRefusesFirstResponder:YES];
[tableView_ setRowHeight:kPreferredRowHeight];
[tableView_ setGridStyleMask:NSTableViewSolidHorizontalGridLineMask];
- [tableView_ setGridColor:
- gfx::SkColorToSRGBNSColor(app_list::kResultBorderColor)];
+ [tableView_
+ setGridColor:skia::SkColorToSRGBNSColor(app_list::kResultBorderColor)];
[tableView_ setBackgroundColor:[NSColor clearColor]];
[tableView_ setAction:@selector(tableViewClicked:)];
[tableView_ setDelegate:self];
@@ -333,9 +333,9 @@ const SkColor kSelectedRowColor = SkColorSetRGB(0xE6, 0xE6, 0xE6);
[[NSMutableParagraphStyle alloc] init]);
[paragraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
NSDictionary* defaultAttributes = @{
- NSForegroundColorAttributeName:
- gfx::SkColorToSRGBNSColor(app_list::kResultDefaultTextColor),
- NSParagraphStyleAttributeName: paragraphStyle
+ NSForegroundColorAttributeName :
+ skia::SkColorToSRGBNSColor(app_list::kResultDefaultTextColor),
+ NSParagraphStyleAttributeName : paragraphStyle
};
base::scoped_nsobject<NSMutableAttributedString> text(
@@ -361,13 +361,13 @@ const SkColor kSelectedRowColor = SkColorSetRGB(0xE6, 0xE6, 0xE6);
if (it->styles & app_list::SearchResult::Tag::DIM) {
NSColor* dimmedColor =
- gfx::SkColorToSRGBNSColor(app_list::kResultDimmedTextColor);
+ skia::SkColorToSRGBNSColor(app_list::kResultDimmedTextColor);
[text addAttribute:NSForegroundColorAttributeName
value:dimmedColor
range:it->range.ToNSRange()];
} else if (it->styles & app_list::SearchResult::Tag::URL) {
NSColor* urlColor =
- gfx::SkColorToSRGBNSColor(app_list::kResultURLTextColor);
+ skia::SkColorToSRGBNSColor(app_list::kResultURLTextColor);
[text addAttribute:NSForegroundColorAttributeName
value:urlColor
range:it->range.ToNSRange()];
@@ -426,9 +426,9 @@ const SkColor kSelectedRowColor = SkColorSetRGB(0xE6, 0xE6, 0xE6);
inView:(NSView*)controlView {
if ([self backgroundStyle] != kBackgroundNormal) {
if ([self backgroundStyle] == kBackgroundSelected)
- [gfx::SkColorToSRGBNSColor(kSelectedRowColor) set];
+ [skia::SkColorToSRGBNSColor(kSelectedRowColor) set];
else
- [gfx::SkColorToSRGBNSColor(kHighlightedRowColor) set];
+ [skia::SkColorToSRGBNSColor(kHighlightedRowColor) set];
// Extend up by one pixel to draw over cell border.
NSRect backgroundRect = cellFrame;
« no previous file with comments | « ui/app_list/cocoa/apps_grid_view_item.mm ('k') | ui/base/clipboard/clipboard_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698