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

Index: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

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

index eca6ecf7fe7838c11180df9f4ecaccd04f5352f4..9b52b476bb7e730d9eda30fe169ed5f8241cad2f 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

@@ -125,7 +125,7 @@ void ExtensionInstalledBubbleBridge::UpdateAnchorPosition() {

const extensions::Extension* extension = extensionBubble->extension();

browser_ = extensionBubble->browser();

DCHECK(browser_);

- icon_.reset([gfx::SkBitmapToNSImage(extensionBubble->icon()) retain]);

+ icon_.reset([skia::SkBitmapToNSImage(extensionBubble->icon()) retain]);

pageActionPreviewShowing_ = NO;

if (extension->is_app()) {

@@ -155,7 +155,7 @@ void ExtensionInstalledBubbleBridge::UpdateAnchorPosition() {

bundle_ = bundle;

DCHECK(browser);

browser_ = browser;

- icon_.reset([gfx::SkBitmapToNSImage(SkBitmap()) retain]);

+ icon_.reset([skia::SkBitmapToNSImage(SkBitmap()) retain]);

pageActionPreviewShowing_ = NO;

type_ = extension_installed_bubble::kBundle;

[self showWindow:self];

@@ -407,7 +407,7 @@ void ExtensionInstalledBubbleBridge::UpdateAnchorPosition() {

[view setMessage:message withFont:font messageColor:[NSColor blackColor]];

[view addLinkRange:NSMakeRange(0, [link length])

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

- linkColor:gfx::SkColorToCalibratedNSColor(

+ linkColor:skia::SkColorToCalibratedNSColor(

chrome_style::GetLinkColor())];

// HACK! The TextView does not report correct height even after you stuff

@@ -489,7 +489,7 @@ void ExtensionInstalledBubbleBridge::UpdateAnchorPosition() {

[[manageShortcutLink_ cell]

setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];

[[manageShortcutLink_ cell]

- setTextColor:gfx::SkColorToCalibratedNSColor(

+ setTextColor:skia::SkColorToCalibratedNSColor(

chrome_style::GetLinkColor())];

[GTMUILocalizerAndLayoutTweaker sizeToFitView:manageShortcutLink_];

newWindowHeight += extension_installed_bubble::kInnerVerticalMargin;