chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm - Issue 1508893003: Use proper namespace in skia/ext

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/cocoa/bookmarks/bookmark_sync_promo_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 | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm ('k') | chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm

index be81a2ea0aa28109f002630e1b8f47c782e30fbe..41fb770dcdcbd82ee621cfdfdee953c3b4c0d633 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm

@@ -68,12 +68,12 @@ const int kFontSize = 11;

- (void)loadView {

NSBox* promoView = [[[NSBox alloc] init] autorelease];

[promoView setBoxType:NSBoxCustom];

- [promoView setFillColor:gfx::SkColorToDeviceNSColor(kBackgroundColor)];

+ [promoView setFillColor:skia::SkColorToDeviceNSColor(kBackgroundColor)];

[promoView setContentViewMargins:NSMakeSize(chrome_style::kHorizontalPadding,

kVerticalPadding)];

[promoView setBorderType:NSLineBorder];

[promoView setBorderWidth:kBorderWidth];

- [promoView setBorderColor:gfx::SkColorToDeviceNSColor(kBorderColor)];

+ [promoView setBorderColor:skia::SkColorToDeviceNSColor(kBorderColor)];

// Add the sync promo text.

size_t offset;

@@ -85,13 +85,13 @@ const int kFontSize = 11;

NSString* nsPromoText = SysUTF16ToNSString(promoText);

NSString* nsLinkText = SysUTF16ToNSString(linkText);

NSFont* font = [NSFont labelFontOfSize:kFontSize];

- NSColor* linkColor = gfx::SkColorToCalibratedNSColor(

+ NSColor* linkColor = skia::SkColorToCalibratedNSColor(

chrome_style::GetLinkColor());

textView_.reset([[HyperlinkTextView alloc] init]);

[textView_ setMessage:nsPromoText

withFont:font

- messageColor:gfx::SkColorToDeviceNSColor(kTextColor)];

+ messageColor:skia::SkColorToDeviceNSColor(kTextColor)];

[textView_ addLinkRange:NSMakeRange(offset, [nsLinkText length])

withURL:@"about:blank" // using a link here is bad ui

linkColor:linkColor];