| Index: chrome/browser/apps/ephemeral_app_launcher.h
|
| diff --git a/chrome/browser/apps/ephemeral_app_launcher.h b/chrome/browser/apps/ephemeral_app_launcher.h
|
| index 01fb2e576d75d53ffb4e47baada1b4d136b8cc96..04927b53f33229a4d9fd412ed4861937e0d63c36 100644
|
| --- a/chrome/browser/apps/ephemeral_app_launcher.h
|
| +++ b/chrome/browser/apps/ephemeral_app_launcher.h
|
| @@ -66,15 +66,15 @@ class EphemeralAppLauncher : public extensions::WebstoreStandaloneInstaller,
|
| content::WebContents* web_contents,
|
| const LaunchCallback& callback);
|
|
|
| - virtual ~EphemeralAppLauncher();
|
| + ~EphemeralAppLauncher() override;
|
|
|
| // Creates an install checker. Allows tests to mock the install checker.
|
| virtual scoped_ptr<extensions::ExtensionInstallChecker>
|
| CreateInstallChecker();
|
|
|
| // WebstoreStandaloneInstaller implementation overridden in tests.
|
| - virtual scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() override;
|
| - virtual scoped_ptr<extensions::WebstoreInstaller::Approval> CreateApproval()
|
| + scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() override;
|
| + scoped_ptr<extensions::WebstoreInstaller::Approval> CreateApproval()
|
| const override;
|
|
|
| private:
|
| @@ -116,31 +116,29 @@ class EphemeralAppLauncher : public extensions::WebstoreStandaloneInstaller,
|
| void OnInstallChecked(int check_failures);
|
|
|
| // WebstoreStandaloneInstaller implementation.
|
| - virtual void InitInstallData(
|
| + void InitInstallData(
|
| extensions::ActiveInstallData* install_data) const override;
|
| - virtual bool CheckRequestorAlive() const override;
|
| - virtual const GURL& GetRequestorURL() const override;
|
| - virtual bool ShouldShowPostInstallUI() const override;
|
| - virtual bool ShouldShowAppInstalledBubble() const override;
|
| - virtual content::WebContents* GetWebContents() const override;
|
| - virtual scoped_refptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt()
|
| + bool CheckRequestorAlive() const override;
|
| + const GURL& GetRequestorURL() const override;
|
| + bool ShouldShowPostInstallUI() const override;
|
| + bool ShouldShowAppInstalledBubble() const override;
|
| + content::WebContents* GetWebContents() const override;
|
| + scoped_refptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt()
|
| const override;
|
| - virtual bool CheckInlineInstallPermitted(
|
| - const base::DictionaryValue& webstore_data,
|
| - std::string* error) const override;
|
| - virtual bool CheckRequestorPermitted(
|
| - const base::DictionaryValue& webstore_data,
|
| - std::string* error) const override;
|
| - virtual void OnManifestParsed() override;
|
| - virtual void CompleteInstall(extensions::webstore_install::Result result,
|
| - const std::string& error) override;
|
| + bool CheckInlineInstallPermitted(const base::DictionaryValue& webstore_data,
|
| + std::string* error) const override;
|
| + bool CheckRequestorPermitted(const base::DictionaryValue& webstore_data,
|
| + std::string* error) const override;
|
| + void OnManifestParsed() override;
|
| + void CompleteInstall(extensions::webstore_install::Result result,
|
| + const std::string& error) override;
|
|
|
| // content::WebContentsObserver implementation.
|
| - virtual void WebContentsDestroyed() override;
|
| + void WebContentsDestroyed() override;
|
|
|
| // ExtensionEnableFlowDelegate implementation.
|
| - virtual void ExtensionEnableFlowFinished() override;
|
| - virtual void ExtensionEnableFlowAborted(bool user_initiated) override;
|
| + void ExtensionEnableFlowFinished() override;
|
| + void ExtensionEnableFlowAborted(bool user_initiated) override;
|
|
|
| LaunchCallback launch_callback_;
|
|
|
|
|