Index: chrome/browser/extensions/api/webstore_private/webstore_private_api.h |
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h |
index 19320bfdeb4710b690d3a82efc642d46b7747677..a28fa79f722b7ee9e9cf89d28536c01182e6b7ad 100644 |
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h |
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h |
@@ -13,6 +13,7 @@ |
#include "chrome/browser/extensions/webstore_install_helper.h" |
#include "chrome/browser/extensions/webstore_installer.h" |
#include "chrome/browser/signin/signin_tracker.h" |
+#include "chrome/common/extensions/api/webstore_private.h" |
#include "content/public/browser/gpu_data_manager_observer.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -62,8 +63,9 @@ class WebstorePrivateInstallBundleFunction : public AsyncExtensionFunction, |
virtual bool RunImpl() OVERRIDE; |
// Reads the extension |details| into |items|. |
- bool ReadBundleInfo(base::ListValue* details, |
- extensions::BundleInstaller::ItemList* items); |
+ bool ReadBundleInfo( |
+ const api::webstore_private::InstallBundle::Params& details, |
+ extensions::BundleInstaller::ItemList* items); |
private: |
scoped_refptr<extensions::BundleInstaller> bundle_; |
@@ -145,13 +147,10 @@ class WebstorePrivateBeginInstallWithManifest3Function |
// Called when signin is complete or not needed. |
void SigninCompletedOrNotNeeded(); |
+ const char* ResultCodeToString(ResultCode code); |
+ |
// 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_; |
- bool enable_launcher_; |
+ scoped_ptr<api::webstore_private::BeginInstallWithManifest3::Params> params_; |
// The results of parsing manifest_ and icon_data_ go into these two. |
scoped_ptr<base::DictionaryValue> parsed_manifest_; |
@@ -194,7 +193,7 @@ class WebstorePrivateCompleteInstallFunction |
}; |
class WebstorePrivateEnableAppLauncherFunction |
- : public AsyncExtensionFunction { |
+ : public SyncExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("webstorePrivate.enableAppLauncher", |
WEBSTOREPRIVATE_ENABLEAPPLAUNCHER) |
@@ -266,7 +265,7 @@ class WebstorePrivateGetWebGLStatusFunction : public AsyncExtensionFunction { |
}; |
class WebstorePrivateGetIsLauncherEnabledFunction |
- : public AsyncExtensionFunction { |
+ : public SyncExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("webstorePrivate.getIsLauncherEnabled", |
WEBSTOREPRIVATE_GETISLAUNCHERENABLED) |
@@ -283,7 +282,7 @@ class WebstorePrivateGetIsLauncherEnabledFunction |
void OnIsLauncherCheckCompleted(bool is_enabled); |
}; |
-class WebstorePrivateIsInIncognitoModeFunction : public AsyncExtensionFunction { |
+class WebstorePrivateIsInIncognitoModeFunction : public SyncExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("webstorePrivate.isInIncognitoMode", |
WEBSTOREPRIVATE_ISININCOGNITOMODEFUNCTION) |