chrome/browser/ui/cocoa/passwords/pending_password_view_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/passwords/pending_password_view_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/passwords/passwords_list_view_controller.mm ('k') | chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/passwords/pending_password_view_controller.mm

diff --git a/chrome/browser/ui/cocoa/passwords/pending_password_view_controller.mm b/chrome/browser/ui/cocoa/passwords/pending_password_view_controller.mm

index 04c459e72fdc434ff6a9a3b3f23564171c12afe4..e0bc8465d0d144d0b4a56ba0f32540088d41b6af 100644

--- a/chrome/browser/ui/cocoa/passwords/pending_password_view_controller.mm

+++ b/chrome/browser/ui/cocoa/passwords/pending_password_view_controller.mm

@@ -103,7 +103,7 @@ const SkColor kWarmWelcomeColor = SkColorSetRGB(0x64, 0x64, 0x64);

NSRange titleBrandLinkRange = model_->title_brand_link_range().ToNSRange();

if (titleBrandLinkRange.length) {

NSColor* linkColor =

- gfx::SkColorToCalibratedNSColor(chrome_style::GetLinkColor());

+ skia::SkColorToCalibratedNSColor(chrome_style::GetLinkColor());

[titleView addLinkRange:titleBrandLinkRange

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

linkColor:linkColor];

@@ -145,7 +145,7 @@ const SkColor kWarmWelcomeColor = SkColorSetRGB(0x64, 0x64, 0x64);

[warm_welcome setFrameSize:NSMakeSize(kDesiredBubbleWidth - 2*kFramePadding,

MAXFLOAT)];

[GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:warm_welcome];

- NSColor* color = gfx::SkColorToCalibratedNSColor(kWarmWelcomeColor);

+ NSColor* color = skia::SkColorToCalibratedNSColor(kWarmWelcomeColor);

[warm_welcome setTextColor:color];

}