Use ImageLoader instead of ImageLoadingTracker (Part 9)

chrome/browser/ui/panels/panel.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_UI_PANELS_PANEL_H_
 #define CHROME_BROWSER_UI_PANELS_PANEL_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/command_updater_delegate.h"
-#include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/panels/panel_constants.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 class GURL;
 class NativePanel;
@@ skipping 17 matching lines @@
 // This class gets the first crack at all the BaseWindow calls for Panels and
 // does one or more of the following:
 // - Do nothing.  The function is not relevant to Panels.
 // - Do Panel specific platform independent processing and then invoke the
 //   function on the platform specific member. For example, restrict panel
 //   size to certain limits.
 // - Invoke an appropriate PanelManager function to do stuff that might affect
 //   other Panels. For example deleting a panel would rearrange other panels.
 class Panel : public BaseWindow,
               public CommandUpdaterDelegate,
-              public content::NotificationObserver,
-              public ImageLoadingTracker::Observer {
+              public content::NotificationObserver {
  public:
   enum ExpansionState {
     // The panel is fully expanded with both title-bar and the client-area.
     EXPANDED,
     // The panel is shown with the title-bar only.
     TITLE_ONLY,
     // The panel is shown with 3-pixel line.
     MINIMIZED
   };
 
@@ skipping 250 matching lines @@
   friend class PanelManager;
   friend class PanelBrowserTest;
 
   enum MaxSizePolicy {
     // Default maximum size is proportional to the work area.
     DEFAULT_MAX_SIZE,
     // Custom maximum size is used when the panel is resized by the user.
     CUSTOM_MAX_SIZE
   };
 
-  // ImageLoadingTracker::Observer implementation.
-  virtual void OnImageLoaded(const gfx::Image& image,
-                             const std::string& extension_id,
-                             int index) OVERRIDE;
+  void OnImageLoaded(const gfx::Image& image);
 
   // Initialize state for all supported commands.
   void InitCommandState();
 
   // Configures the renderer for auto resize (if auto resize is enabled).
   void ConfigureAutoResize(content::WebContents* web_contents);
 
   // Load the app's image, firing a load state change when loaded.
   void UpdateAppIcon();
 
@@ skipping 44 matching lines @@
   ExpansionState expansion_state_;
 
   // The CommandUpdater manages the window commands.
   CommandUpdater command_updater_;
 
   content::NotificationRegistrar registrar_;
   const SessionID session_id_;
   scoped_ptr<extensions::WindowController> extension_window_controller_;
   scoped_ptr<PanelHost> panel_host_;
 
-  // Used for loading app_icon_.
-  scoped_ptr<ImageLoadingTracker> app_icon_loader_;
-
   // Icon showed in the task bar.
   gfx::Image app_icon_;
 
+  base::WeakPtrFactory<Panel> image_loader_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(Panel);
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_H_