Fix bug where we were not displaying icons in the management

chrome/browser/extensions/extensions_ui.h

 // Copyright (c) 2006-2009 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_EXTENSIONS_UI_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSIONS_UI_H_
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/shell_dialogs.h"
+#include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 class DictionaryValue;
 class Extension;
 class ExtensionsService;
 class FilePath;
 class PrefService;
 class UserScript;
@@ skipping 25 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ExtensionsUIHTMLSource);
 };
 
 // The handler for Javascript messages related to the "extensions" view.
 class ExtensionsDOMHandler
     : public DOMMessageHandler,
       public NotificationObserver,
       public PackExtensionJob::Client,
       public SelectFileDialog::Listener {
  public:
+
+  // Helper class that loads the icons for the extensions in the management UI.
+  // We do this with native code instead of just using chrome-extension:// URLs
+  // for two reasons:
+  //
+  // 1. We need to support the disabled extensions, too, and using URLs won't
+  //    work for them.
+  // 2. We want to desaturate the icons of the disabled extensions to make them
+  //    look more disabled.
+  class IconLoader : public base::RefCountedThreadSafe<IconLoader> {
+   public:
+    IconLoader(ExtensionsDOMHandler* handler);
+
+    // Load |icons|. Will call handler->OnIconsLoaded when complete. IconLoader
+    // takes ownership of both arguments.
+    void LoadIcons(std::vector<ExtensionResource>* icons,
+                   DictionaryValue* json);
+
+    // Cancel the load. IconLoader won't try to call back to the handler after
+    // this.
+    void Cancel();
+
+   private:
+    // Load the icons and call ReportResultOnUIThread when done. This method
+    // takes ownership of both arguments.
+    void LoadIconsOnFileThread(std::vector<ExtensionResource>* icons,
+                               DictionaryValue* json);
+
+    // Report back to the handler. This method takes ownership of |json|.
+    void ReportResultOnUIThread(DictionaryValue* json);
+
+    // The handler we will report back to.
+    ExtensionsDOMHandler* handler_;
+  };
+
   explicit ExtensionsDOMHandler(ExtensionsService* extension_service);
   virtual ~ExtensionsDOMHandler();
 
   // DOMMessageHandler implementation.
   virtual void RegisterMessages();
 
   // Extension Detail JSON Struct for page. (static for ease of testing).
   static DictionaryValue* CreateExtensionDetailValue(
       const Extension *extension,
       const std::vector<ExtensionPage>&,
@@ skipping 58 matching lines @@
 
   // NotificationObserver
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Helper that lists the current active html pages for an extension.
   std::vector<ExtensionPage> GetActivePagesForExtension(
       const std::string& extension_id);
 
+  // Returns the best icon to display in the UI for an extension, or NULL if no
+  // good icon exists.
+  ExtensionResource PickExtensionIcon(Extension* extension);
+
+  // Loads the extension resources into the json data, then calls OnIconsLoaded.
+  // Takes ownership of |icons|.
+  // Called on the file thread.
+  void LoadExtensionIcons(std::vector<ExtensionResource>* icons,
+                          DictionaryValue* json_data);
+
+  // Tells the HTML about |json_data|.
+  // Takes ownership of |json_data|.
+  // Called on the UI thread.
+  void OnIconsLoaded(DictionaryValue* json_data);
+
   // Our model.
   scoped_refptr<ExtensionsService> extensions_service_;
 
   // Used to pick the directory when loading an extension.
   scoped_refptr<SelectFileDialog> load_extension_dialog_;
 
   // Used to package the extension.
   scoped_refptr<PackExtensionJob> pack_job_;
 
+  // Used to load icons.

[Finnur, 2009/11/05 03:55:08]

nit: This comment is a bit scarce. Can you add: "asynchronously on the File
thread"?

+  scoped_refptr<IconLoader> icon_loader_;
+
   // We monitor changes to the extension system so that we can reload when
   // necessary.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsDOMHandler);
 };
 
 class ExtensionsUI : public DOMUI {
  public:
   explicit ExtensionsUI(TabContents* contents);
 
   static RefCountedMemory* GetFaviconResourceBytes();
 
   static void RegisterUserPrefs(PrefService* prefs);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionsUI);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSIONS_UI_H_