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

Unified Diff: chrome/browser/favicon/favicon_tab_helper.cc

Issue 10821035: wip Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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/favicon/favicon_service.cc ('k') | chrome/browser/history/history_backend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_tab_helper.cc
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc
index 84779f325e08937f51658343cc2559a68b23f6ff..675285b0e65163d832ce2ba3fd33b1142082ad8e 100644
--- a/chrome/browser/favicon/favicon_tab_helper.cc
+++ b/chrome/browser/favicon/favicon_tab_helper.cc
@@ -44,12 +44,17 @@ FaviconTabHelper::~FaviconTabHelper() {
}
void FaviconTabHelper::FetchFavicon(const GURL& url) {
+ // XXX query scale factor, pass to handler
favicon_handler_->FetchFavicon(url);
if (touch_icon_handler_.get())
touch_icon_handler_->FetchFavicon(url);
}
SkBitmap FaviconTabHelper::GetFavicon() const {
+ // XXX return the default favicon or empty gfx::ImageSkia till the bitmap for
+ // the initial scale factor is loaded. Once that bitmap is loaded,
+ // FaviconTabHelper::GetFavicon() should return a gfx::ImageSkia backed by an
+ // ImageSkiaSource with any already loaded scale factors already cached.
// Like GetTitle(), we also want to use the favicon for the last committed
// entry rather than a pending navigation entry.
const NavigationController& controller = web_contents()->GetController();
« no previous file with comments | « chrome/browser/favicon/favicon_service.cc ('k') | chrome/browser/history/history_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698