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 "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.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"
+#include "googleurl/src/gurl.h"
+#include "third_party/skia/include/core/SkBitmap.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 {
+class UpdateShortcutWorker : public content::NotificationObserver {
  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(
+  // Favicon download callback.
+  void DidDownloadFavicon(
       int id,
       const GURL& image_url,
       bool errored,
       int requested_size,
-      const std::vector<SkBitmap>& bitmaps) OVERRIDE;
+      const std::vector<SkBitmap>& bitmaps);
 
   // Checks if shortcuts exists on desktop, start menu and quick launch.
   void CheckExistingShortcuts();
 
   // Update shortcut files and icons.
   void UpdateShortcuts();
   void UpdateShortcutsOnFileThread();
 
   // Callback after shortcuts are updated.
   void OnShortcutsUpdated(bool);
@@ skipping 68 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),
+      base::Bind(&UpdateShortcutWorker::DidDownloadFavicon,
+                 base::Unretained(this)));
   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.
-    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);
 
   if (!errored && !bitmaps.empty() && !bitmaps[closest_index].isNull()) {
     // Update icon with download image and update shortcut.
@@ skipping 170 matching lines @@
   shortcut_info->extension_id = app.id();
   shortcut_info->is_platform_app = app.is_platform_app();
   shortcut_info->url = GURL(app.launch_web_url());
   shortcut_info->title = UTF8ToUTF16(app.name());
   shortcut_info->description = UTF8ToUTF16(app.description());
   shortcut_info->extension_path = app.path();
   shortcut_info->profile_path = profile->GetPath();
 }
 
 }  // namespace web_app