chrome/browser/ui/panels/panel.cc - Issue 10827259: Change panels to use gfx::Image instead of SkBitmap for favicon.

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/panels/panel.cc

Issue 10827259: Change panels to use gfx::Image instead of SkBitmap for favicon. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: applied change to panel_titlebar_gtk.cc after syncing 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:

Index: chrome/browser/ui/panels/panel.cc

diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc

index b4ebc4cca1531eb47a17b47fdf77da4e65d0a544..b8a2790deb6e5792aa232db996e3ab54c1c76e2d 100644

--- a/chrome/browser/ui/panels/panel.cc

+++ b/chrome/browser/ui/panels/panel.cc

@@ -31,7 +31,7 @@

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_contents.h"

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

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

#include "ui/gfx/rect.h"

using content::RenderViewHost;

@@ -750,7 +750,7 @@ void Panel::FormatTitleForDisplay(string16* title) {

}

-SkBitmap Panel::GetCurrentPageIcon() const {

+gfx::Image Panel::GetCurrentPageIcon() const {

return panel_host_->GetPageIcon();

}