chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 10834368: Convert mostly favicon related code from SkBitmap to ImageSkia and Image

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/location_bar/location_bar_view_mac.mm

Issue 10834368: Convert mostly favicon related code from SkBitmap to ImageSkia and Image (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 months 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/location_bar/location_bar_view_mac.h ('k') | chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm » ('j') | chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

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

index 9484bba743879792e8540b1e5f1c0127f3df324e..361e34dff8cf72fa2725e7d7f619cba5a7f5586b 100644

--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -66,6 +66,7 @@

#include "third_party/skia/include/core/SkBitmap.h"

Nico 2012/08/16 20:26:27 can this go?

pkotwicz 2012/08/16 21:32:31 SkBitmap is still used by LocationBarViewMac::GetK

Nico 2012/08/16 21:35:06 But only in reference form, so the definition shou

#include "ui/base/l10n/l10n_util_mac.h"

#include "ui/base/resource/resource_bundle.h"

+#include "ui/gfx/image/image.h"

using content::WebContents;

@@ -317,7 +318,7 @@ void LocationBarViewMac::OnKillFocus() {

// Do nothing.

}

-SkBitmap LocationBarViewMac::GetFavicon() const {

+gfx::Image LocationBarViewMac::GetFavicon() const {

return browser_->GetCurrentPageIcon();

}