chrome/browser/ui/panels/panel_view.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_view.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_view.cc

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

index 27fc80d5c28dab8235edd66fb46db3000adf6f16..b18d0fca355552a69198950eac6cd94bc3c74c5a 100644

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

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

@@ -13,6 +13,7 @@

#include "chrome/browser/ui/panels/panel_manager.h"

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

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

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

#include "ui/gfx/path.h"

#include "ui/gfx/screen.h"

#include "ui/views/controls/button/image_button.h"

@@ -504,7 +505,8 @@ string16 PanelView::GetWindowTitle() const {

}

gfx::ImageSkia PanelView::GetWindowIcon() {

- return panel_->GetCurrentPageIcon();

+ gfx::Image icon = panel_->GetCurrentPageIcon();

+ return icon.IsEmpty() ? gfx::ImageSkia() : *icon.ToImageSkia();

}

void PanelView::DeleteDelegate() {