move favicon download code from chrome/ into content/

chrome/browser/ui/web_applications/web_app_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/favicon/favicon_download_helper.h"
-#include "chrome/browser/favicon/favicon_download_helper_delegate.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/favicon_download_delegate.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/environment.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #endif
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::WebContents;
 
 namespace {
 
 #if defined(OS_WIN)
 // UpdateShortcutWorker holds all context data needed for update shortcut.
 // It schedules a pre-update check to find all shortcuts that needs to be
 // updated. If there are such shortcuts, it schedules icon download and
 // update them when icons are downloaded. It observes TAB_CLOSING notification
 // and cancels all the work when the underlying tab is closing.
 class UpdateShortcutWorker : public content::NotificationObserver,
-                             public FaviconDownloadHelperDelegate {
+                             public content::FaviconDownloadDelegate {
  public:
   explicit UpdateShortcutWorker(WebContents* web_contents);
 
   void Run();
 
  private:
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
   // Downloads icon via the FaviconTabHelper.
   void DownloadIcon();
 
-  // FaviconDownloadHelperDelegate override.
-  virtual void OnDidDownloadFavicon(
+  // content::WebContentsDelegate override.

[jam, 2012/11/27 01:16:31]

nit: content::FaviconDownloadDelegate

[Cait (Slow), 2012/11/28 00:11:45]

Done.

+  virtual void DidDownloadFavicon(
       int id,
       const GURL& image_url,
       bool errored,
       int requested_size,
       const std::vector<SkBitmap>& bitmaps) OVERRIDE;
 
   // Checks if shortcuts exists on desktop, start menu and quick launch.
   void CheckExistingShortcuts();
 
   // Update shortcut files and icons.
@@ skipping 38 matching lines @@
       extensions::TabHelper::FromWebContents(web_contents);
   web_app::GetShortcutInfoForTab(web_contents_, &shortcut_info_);
   web_app::GetIconsInfo(extensions_tab_helper->web_app_info(),
                         &unprocessed_icons_);
   file_name_ = web_app::internals::GetSanitizedFileName(shortcut_info_.title);
 
   registrar_.Add(
       this,
       chrome::NOTIFICATION_TAB_CLOSING,
       content::Source<NavigationController>(&web_contents->GetController()));
+  web_contents_->RegisterFaviconDelegate(this);
 }
 
 void UpdateShortcutWorker::Run() {
   // Starting by downloading app icon.
   DownloadIcon();
 }
 
 void UpdateShortcutWorker::Observe(
     int type,
     const content::NotificationSource& source,
@@ skipping 15 matching lines @@
     DeleteMe();  // We are done if underlying WebContents is gone.
     return;
   }
 
   if (unprocessed_icons_.empty()) {
     // No app icon. Just use the favicon from WebContents.
     UpdateShortcuts();
     return;
   }
 
-  scoped_ptr<FaviconDownloadHelper> download_helper(
-      new FaviconDownloadHelper(web_contents_, this));
-
-  download_helper->DownloadFavicon(unprocessed_icons_.back().url,
-                                   std::max(unprocessed_icons_.back().width,
-                                            unprocessed_icons_.back().height));
+  web_contents_->DownloadFavicon(unprocessed_icons_.back().url,
+                                 std::max(unprocessed_icons_.back().width,
+                                          unprocessed_icons_.back().height));
   unprocessed_icons_.pop_back();
 }
 
-void UpdateShortcutWorker::OnDidDownloadFavicon(
+void UpdateShortcutWorker::DidDownloadFavicon(
     int id,
     const GURL& image_url,
     bool errored,
     int requested_size,
     const std::vector<SkBitmap>& bitmaps) {
   if (web_contents_ == NULL) {
     DeleteMe();  // We are done if underlying WebContents is gone.

[jam, 2012/11/27 01:16:31]

this can't happen anymore right?

[Cait (Slow), 2012/11/28 00:11:45]

Done.

     return;
   }
 
   std::vector<ui::ScaleFactor> scale_factors;
   scale_factors.push_back(ui::SCALE_FACTOR_100P);
 
   size_t closest_index =
       FaviconUtil::SelectBestFaviconFromBitmaps(bitmaps,
                                                 scale_factors,
                                                 requested_size);
@@ skipping 161 matching lines @@
 
 void UpdateShortcutForTabContents(WebContents* web_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace web_app