Index: chrome/browser/ui/metro_pin_tab_helper_win.h |
diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.h b/chrome/browser/ui/metro_pin_tab_helper_win.h |
index 45b157368da2a98c5ad691fcb2ef7143f2ce972a..5f2851b386f6cd38aefc666620f0b0c8c25125f3 100644 |
--- a/chrome/browser/ui/metro_pin_tab_helper_win.h |
+++ b/chrome/browser/ui/metro_pin_tab_helper_win.h |
@@ -7,11 +7,10 @@ |
#include <vector> |
-#include "chrome/browser/favicon/favicon_download_helper.h" |
-#include "chrome/browser/favicon/favicon_download_helper_delegate.h" |
-#include "chrome/common/favicon_url.h" |
+#include "content/public/browser/favicon_download_delegate.h" |
#include "content/public/browser/web_contents_observer.h" |
#include "content/public/browser/web_contents_user_data.h" |
+#include "content/public/common/favicon_url.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "ui/gfx/image/image_skia.h" |
@@ -19,7 +18,7 @@ |
class MetroPinTabHelper |
: public content::WebContentsObserver, |
public content::WebContentsUserData<MetroPinTabHelper>, |
- public FaviconDownloadHelperDelegate { |
+ public content::FaviconDownloadDelegate { |
public: |
virtual ~MetroPinTabHelper(); |
@@ -41,29 +40,28 @@ class MetroPinTabHelper |
explicit MetroPinTabHelper(content::WebContents* tab_contents); |
friend class content::WebContentsUserData<MetroPinTabHelper>; |
- // FaviconDownloadHelperDelegate overrides. |
- void OnUpdateFaviconURL(int32 page_id, |
- const std::vector<FaviconURL>& candidates) OVERRIDE; |
+ // content::FaviconDownloadDelegate overrides. |
+ void UpdateFaviconURL( |
+ int32 page_id, |
+ const std::vector<content::FaviconURL>& candidates) OVERRIDE; |
- void OnDidDownloadFavicon(int id, |
- const GURL& image_url, |
- bool errored, |
- int requested_size, |
- const std::vector<SkBitmap>& bitmaps) OVERRIDE; |
+ void DidDownloadFavicon(int id, |
+ const GURL& image_url, |
+ bool errored, |
+ int requested_size, |
+ const std::vector<SkBitmap>& bitmaps) OVERRIDE; |
void UnPinPageFromStartScreen(); |
- // Called by the |favicon_downloader_| when it has finished. |
+ // Called by the |favicon_chooser_| when it has finished. |
void FaviconDownloaderFinished(); |
// Candidate Favicon URLs for the current page. |
- std::vector<FaviconURL> favicon_url_candidates_; |
+ std::vector<content::FaviconURL> favicon_url_candidates_; |
// The currently active FaviconChooser, if there is one. |
scoped_ptr<FaviconChooser> favicon_chooser_; |
- // FaviconDownloadHelper handles the sending and listening for IPC messages. |
- FaviconDownloadHelper favicon_download_helper_; |
DISALLOW_COPY_AND_ASSIGN(MetroPinTabHelper); |
}; |