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

Index: chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

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

index 50d2a37e4964363c1504caff56fbe16f5b790589..58390dae94010d643ac194533aea728b2c0d9174 100644

--- a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

@@ -95,7 +95,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

[[self bubble] setAlignment:info_bubble::kAlignRightEdgeToAnchorEdge];

[[self bubble] setArrowLocation:info_bubble::kNoArrow];

[[self bubble] setBackgroundColor:

- gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

+ skia::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

ui::NativeTheme::kColorId_DialogBackground))];

[self performLayout];

@@ -233,7 +233,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

[separatorView setBoxType:NSBoxCustom];

ui::NativeTheme* nativeTheme = ui::NativeThemeMac::instance();

[separatorView setBorderColor:

- gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

+ skia::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

ui::NativeTheme::kColorId_MenuSeparatorColor))];

[[[self window] contentView] addSubview:separatorView];

@@ -336,7 +336,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

NSAttributedString* title = [self attributedTitle];

if ([self hoverState] != kHoverStateNone) {

ui::NativeTheme* nativeTheme = ui::NativeThemeMac::instance();

- [gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

+ [skia::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor)) set];

NSRectFillUsingOperation(bounds, NSCompositeSourceOver);

@@ -344,7 +344,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

base::scoped_nsobject<NSMutableAttributedString> selectedTitle(

[[NSMutableAttributedString alloc] initWithAttributedString:title]);

NSColor* selectedTitleColor =

- gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

+ skia::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor));

[selectedTitle addAttribute:NSForegroundColorAttributeName

value:selectedTitleColor