chrome/browser/ui/panels/panel_host.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_host.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_host.cc

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

index a01870a80294d31017e929d4b576b8ad9a72c0f2..7b901fb8244e48100b640f293c2a378ce1637951 100644

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

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

@@ -27,7 +27,7 @@

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

#include "ipc/ipc_message.h"

#include "ipc/ipc_message_macros.h"

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

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

#include "ui/gfx/rect.h"

using content::UserMetricsAction;

@@ -66,10 +66,9 @@ void PanelHost::DestroyWebContents() {

web_contents_.reset();

}

-SkBitmap PanelHost::GetPageIcon() const {

- // TODO: Make this function return gfx::Image.

+gfx::Image PanelHost::GetPageIcon() const {

return favicon_tab_helper_.get() ?

- favicon_tab_helper_->GetFavicon().AsBitmap() : SkBitmap();

+ favicon_tab_helper_->GetFavicon() : gfx::Image();

}

void PanelHost::NavigationStateChanged(const content::WebContents* source,