| 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();
|
|
|