| 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 852fb4744b2a6eb721dfca1e9be6d0a4d5c9ab18..418a496503d69e9f75d8869c76827e0aa5258e60 100644
|
| --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h
|
| +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h
|
| @@ -13,10 +13,8 @@
|
| #include "chrome/browser/extensions/extension_install_prompt.h"
|
| #include "chrome/browser/extensions/webstore_install_helper.h"
|
| #include "chrome/browser/extensions/webstore_installer.h"
|
| -#include "chrome/browser/signin/signin_manager_factory.h"
|
| #include "chrome/common/extensions/api/webstore_private.h"
|
| #include "chrome/common/extensions/webstore_install_result.h"
|
| -#include "components/signin/core/browser/signin_tracker.h"
|
| #include "content/public/browser/gpu_data_manager_observer.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| @@ -24,7 +22,6 @@
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| class ProfileSyncService;
|
| -class SigninManagerBase;
|
|
|
| namespace content {
|
| class GpuDataManager;
|
| @@ -79,8 +76,7 @@ class WebstorePrivateInstallBundleFunction
|
| class WebstorePrivateBeginInstallWithManifest3Function
|
| : public ChromeAsyncExtensionFunction,
|
| public ExtensionInstallPrompt::Delegate,
|
| - public WebstoreInstallHelper::Delegate,
|
| - public SigninTracker::Observer {
|
| + public WebstoreInstallHelper::Delegate {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("webstorePrivate.beginInstallWithManifest3",
|
| WEBSTOREPRIVATE_BEGININSTALLWITHMANIFEST3)
|
| @@ -112,9 +108,6 @@ class WebstorePrivateBeginInstallWithManifest3Function
|
| // Invalid icon url.
|
| INVALID_ICON_URL,
|
|
|
| - // Signin has failed.
|
| - SIGNIN_FAILED,
|
| -
|
| // An extension with the same extension id has already been installed.
|
| ALREADY_INSTALLED,
|
| };
|
| @@ -145,15 +138,6 @@ class WebstorePrivateBeginInstallWithManifest3Function
|
| void SetResultCode(ResultCode code);
|
|
|
| private:
|
| - // SigninTracker::Observer override.
|
| - virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
|
| - virtual void SigninSuccess() OVERRIDE;
|
| - virtual void MergeSessionComplete(
|
| - const GoogleServiceAuthError& error) OVERRIDE;
|
| -
|
| - // Called when signin is complete or not needed.
|
| - void SigninCompletedOrNotNeeded();
|
| -
|
| const char* ResultCodeToString(ResultCode code);
|
|
|
| // These store the input parameters to the function.
|
| @@ -170,8 +154,6 @@ class WebstorePrivateBeginInstallWithManifest3Function
|
| // The class that displays the install prompt.
|
| scoped_ptr<ExtensionInstallPrompt> install_prompt_;
|
|
|
| - scoped_ptr<SigninTracker> signin_tracker_;
|
| -
|
| scoped_ptr<ScopedActiveInstall> scoped_active_install_;
|
|
|
| // The authuser query parameter value which should be used with CRX download
|
| @@ -317,39 +299,6 @@ class WebstorePrivateIsInIncognitoModeFunction
|
| virtual bool RunSync() OVERRIDE;
|
| };
|
|
|
| -class WebstorePrivateSignInFunction : public ChromeAsyncExtensionFunction,
|
| - public SigninManagerFactory::Observer,
|
| - public SigninTracker::Observer {
|
| - public:
|
| - DECLARE_EXTENSION_FUNCTION("webstorePrivate.signIn",
|
| - WEBSTOREPRIVATE_SIGNINFUNCTION)
|
| -
|
| - WebstorePrivateSignInFunction();
|
| -
|
| - protected:
|
| - virtual ~WebstorePrivateSignInFunction();
|
| -
|
| - // ExtensionFunction:
|
| - virtual bool RunAsync() OVERRIDE;
|
| -
|
| - // SigninManagerFactory::Observer:
|
| - virtual void SigninManagerShutdown(SigninManagerBase* manager) OVERRIDE;
|
| -
|
| - // SigninTracker::Observer:
|
| - virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
|
| - virtual void SigninSuccess() OVERRIDE;
|
| - virtual void MergeSessionComplete(const GoogleServiceAuthError& error)
|
| - OVERRIDE;
|
| -
|
| - private:
|
| - // The sign-in manager for the invoking tab's Chrome Profile. Weak reference.
|
| - SigninManagerBase* signin_manager_;
|
| -
|
| - // Tracks changes to sign-in state. Used to notify the page when an existing
|
| - // in-progress sign-in completes, either with success or failure.
|
| - scoped_ptr<SigninTracker> signin_tracker_;
|
| -};
|
| -
|
| class WebstorePrivateLaunchEphemeralAppFunction
|
| : public ChromeAsyncExtensionFunction {
|
| public:
|
|
|