Add a iconUrl parameter to webstorePrivate.beginInstallWithManifest2

chrome/browser/extensions/extension_webstore_private_api.h

 // Copyright (c) 2011 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_EXTENSION_WEBSTORE_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBSTORE_PRIVATE_API_H_
 #pragma once
 
 #include <string>
 
@@ skipping 53 matching lines @@
     ICON_ERROR,
 
     // The extension id was invalid.
     INVALID_ID,
 
     // The page does not have permission to call this function.
     PERMISSION_DENIED,
 
     // The function was not called during a user gesture.
     NO_GESTURE,
+
+    // Invalid icon url.
+    INVALID_ICON_URL
   };
 
   // For use only in tests - sets a flag that can cause this function to ignore
   // the normal requirement that it is called during a user gesture.
   static void SetIgnoreUserGestureForTests(bool ignore);
 
   // For use only in tests - sets a flag that makes invocations of
   // beginInstallWithManifest skip putting up a real dialog, and instead act
   // as if the dialog choice was to proceed or abort.
   static void SetAutoConfirmForTests(bool should_proceed);
 
-  // Called when we've successfully parsed the manifest and icon data in the
-  // utility process. Ownership of parsed_manifest is transferred.
+  // Called when we've successfully parsed the manifest and decoded the icon in
+  // the utility process. Ownership of parsed_manifest is transferred.
   void OnParseSuccess(const SkBitmap& icon,
                       base::DictionaryValue* parsed_manifest);
 
   // Called to indicate a parse failure. The |result_code| parameter should
-  // indicate whether the problem was with the manifest or icon data.
+  // indicate whether the problem was with the manifest or icon.
   void OnParseFailure(ResultCode result_code, const std::string& error_message);
 
   // Implementing ExtensionInstallUI::Delegate interface.
   virtual void InstallUIProceed() OVERRIDE;
   virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
  protected:
   virtual ~BeginInstallWithManifestFunction();
   virtual bool RunImpl();
 
   // Sets the result_ as a string based on |code|.
   void SetResult(ResultCode code);
 
  private:
   // These store the input parameters to the function.
   std::string id_;
   std::string manifest_;
   std::string icon_data_;
   std::string localized_name_;
   bool use_app_installed_bubble_;
 
   // The results of parsing manifest_ and icon_data_ go into these two.
   scoped_ptr<base::DictionaryValue> parsed_manifest_;
   SkBitmap icon_;
 
   // A dummy Extension object we create for the purposes of using
   // ExtensionInstallUI to prompt for confirmation of the install.
   scoped_refptr<Extension> dummy_extension_;
+
   DECLARE_EXTENSION_FUNCTION_NAME("webstorePrivate.beginInstallWithManifest2");
 };
 
 class CompleteInstallFunction : public SyncExtensionFunction {
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("webstorePrivate.completeInstall");
 };
 
 class GetBrowserLoginFunction : public SyncExtensionFunction {
   virtual bool RunImpl();
@@ skipping 35 matching lines @@
   // Are we waiting for a token available notification?
   bool waiting_for_token_;
 
   // Used for listening for TokenService notifications.
   NotificationRegistrar registrar_;
 
   DECLARE_EXTENSION_FUNCTION_NAME("webstorePrivate.promptBrowserLogin");
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBSTORE_PRIVATE_API_H_