Use ImageLoader instead of ImageLoadingTracker (Part 12)

chrome/browser/extensions/tab_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
 
 #include <map>
 #include <string>
 #include "base/memory/ref_counted.h"
@@ skipping 19 matching lines @@
 namespace extensions {
 class Extension;
 class LocationBarController;
 class ScriptBadgeController;
 class ScriptBubbleController;
 class ScriptExecutor;
 
 // Per-tab extension helper. Also handles non-extension apps.
 class TabHelper : public content::WebContentsObserver,
                   public ExtensionFunctionDispatcher::Delegate,
-                  public ImageLoadingTracker::Observer,
                   public AppNotifyChannelSetup::Delegate,
                   public base::SupportsWeakPtr<TabHelper>,
                   public content::NotificationObserver,
                   public content::WebContentsUserData<TabHelper> {
  public:
   // Different types of action when web app info is available.
   // OnDidGetApplicationInfo uses this to dispatch calls.
   enum WebAppAction {
     NONE,             // No action at all.
     CREATE_SHORTCUT,  // Bring up create application shortcut dialog.
@@ skipping 142 matching lines @@
       const ScriptExecutionObserver::ExecutingScriptsMap& extension_ids,
       int32 page_id,
       const GURL& on_url);
 
   // App extensions related methods:
 
   // Resets app_icon_ and if |extension| is non-null creates a new
   // ImageLoadingTracker to load the extension's image.
   void UpdateExtensionAppIcon(const Extension* extension);
 
-  const Extension* GetExtension(
-      const std::string& extension_app_id);
+  const Extension* GetExtension(const std::string& extension_app_id);
 
-  // ImageLoadingTracker::Observer.
-  virtual void OnImageLoaded(const gfx::Image& image,
-                             const std::string& extension_id,
-                             int index) OVERRIDE;
+  void OnImageLoaded(const gfx::Image& image);
 
   // WebstoreStandaloneInstaller::Callback.
   virtual void OnInlineInstallComplete(int install_id,
                                        int return_route_id,
                                        bool success,
                                        const std::string& error);
 
   // AppNotifyChannelSetup::Delegate.
   virtual void AppNotifyChannelSetupComplete(
       const std::string& channel_id,
@@ skipping 20 matching lines @@
   // created for.
   const Extension* extension_app_;
 
   // Icon for extension_app_ (if non-null) or a manually-set icon for
   // non-extension apps.
   SkBitmap extension_app_icon_;
 
   // Process any extension messages coming from the tab.
   ExtensionFunctionDispatcher extension_function_dispatcher_;
 
-  // Used for loading extension_app_icon_.
-  scoped_ptr<ImageLoadingTracker> extension_app_image_loader_;
-
   // Cached web app info data.
   WebApplicationInfo web_app_info_;
 
   // Which deferred action to perform when OnDidGetApplicationInfo is notified
   // from a WebContents.
   WebAppAction pending_web_app_action_;
 
   content::NotificationRegistrar registrar_;
 
   scoped_ptr<ScriptExecutor> script_executor_;
 
   scoped_ptr<LocationBarController> location_bar_controller_;
 
   scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_;
 
   scoped_ptr<ScriptBubbleController> script_bubble_controller_;
 
   Profile* profile_;
 
+  // Vend weak pointers that can be invalidated to stop in-progress loads.
+  base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(TabHelper);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_