Revert 227477 "Refactored loading of applications / extensions i..."

trunk/src/chrome/browser/extensions/api/developer_private/developer_private_api.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_API_DEVELOPER_PRIVATE_DEVELOPER_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_DEVELOPER_PRIVATE_API_H_
 
 #include "base/platform_file.h"
 #include "chrome/browser/extensions/api/developer_private/entry_picker.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
@@ skipping 115 matching lines @@
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
 class DeveloperPrivateGetItemsInfoFunction : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("developerPrivate.getItemsInfo",
                              DEVELOPERPRIVATE_GETITEMSINFO)
 
-  DeveloperPrivateGetItemsInfoFunction();
-
  protected:
   virtual ~DeveloperPrivateGetItemsInfoFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 
  private:
-  // List of extensions/apps items to return. This list will be populated in a
-  // first step. Then, it will be used to keep track of items that need to be
-  // filled with icons.
-  ItemInfoList item_list_;
-
-  // Index of the extension/app in |item_list_| for which we need to load the
-  // icon.
-  int icon_to_load_;
 
   scoped_ptr<developer::ItemInfo> CreateItemInfo(
       const extensions::Extension& item,
       bool item_is_enabled);
 
+  void GetIconsOnFileThread(
+      ItemInfoList item_list,
+      std::map<std::string, ExtensionResource> itemIdToIconResourceMap);
+
   // Helper that lists the current inspectable html pages for the extension.
   void GetInspectablePagesForExtensionProcess(
       const Extension* extension,
       const std::set<content::RenderViewHost*>& views,
       ItemInspectViewList* result);
 
   ItemInspectViewList GetInspectablePagesForExtension(
       const extensions::Extension* extension,
       bool extension_is_enabled);
 
   void GetShellWindowPagesForExtensionProfile(
       const extensions::Extension* extension,
       ItemInspectViewList* result);
 
   linked_ptr<developer::ItemInspectView> constructInspectView(
       const GURL& url,
       int render_process_id,
       int render_view_id,
       bool incognito,
       bool generated_background_page);
-
-  // Request the icon of the extension/app at the index |icon_to_load_| in
-  // |item_list_|.
-  void RequestNextIcon();
-
-  // Called when each icon has been loaded by RequestNextIcon(). |url| is the
-  // data url containing the icon.
-  void LoadIconFinished(const GURL& url);
 };
 
 class DeveloperPrivateInspectFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("developerPrivate.inspect",
                              DEVELOPERPRIVATE_INSPECT)
 
  protected:
   virtual ~DeveloperPrivateInspectFunction();
 
@@ skipping 241 matching lines @@
 
    void GetUnpackedExtension(const base::FilePath& path,
                              const ExtensionSet* extensions);
 };
 
 }  // namespace api
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_DEVELOPER_PRIVATE_API_H_