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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/browser.cc

Issue 10837090: Change return type of FaviconTabHelper::GetFavicon() to gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win? 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/task_manager/task_manager_resource_providers.cc ('k') | chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm » ('j') | chrome/browser/ui/panels/panel_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 5fcb3737a57bab141171b59932cd0b7970b6a260..1938d631ad7f0ff210e665529c46f9c82f264d90 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -534,7 +534,9 @@ SkBitmap Browser::GetCurrentPageIcon() const {
TabContents* contents = chrome::GetActiveTabContents(this);
// |contents| can be NULL since GetCurrentPageIcon() is called by the window
// during the window's creation (before tabs have been added).
- return contents ? contents->favicon_tab_helper()->GetFavicon() : SkBitmap();
+ // TODO: Let this return a gfx::Image.
+ return contents ?
+ contents->favicon_tab_helper()->GetFavicon().AsBitmap() : SkBitmap();
}
string16 Browser::GetWindowTitleForCurrentTab() const {
« no previous file with comments | « chrome/browser/task_manager/task_manager_resource_providers.cc ('k') | chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm » ('j') | chrome/browser/ui/panels/panel_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698