Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Issues Search
    My Issues | Starred     Open | Closed | All

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: compile fix 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
« chrome/browser/ui/panels/panel_browser_titlebar_gtk.cc ('K') | « chrome/browser/ui/panels/panel_host.cc ('k') | chrome/browser/ui/panels/panel_window_controller_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e0dd484c6f500e2bb9f8c737e21c163ae2580ed2..47bc31fa4c808688de362f9a8f4864743f2e2c4f 100644
--- a/chrome/browser/ui/panels/panel_view.cc
+++ b/chrome/browser/ui/panels/panel_view.cc
@@ -11,6 +11,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"
@@ -446,7 +447,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() {
« chrome/browser/ui/panels/panel_browser_titlebar_gtk.cc ('K') | « chrome/browser/ui/panels/panel_host.cc ('k') | chrome/browser/ui/panels/panel_window_controller_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698