X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fextensions%2Fexternal_install_error.h;h=c26aa7303b47655685fd71f7cb127b43e052aa83;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=ff65e498a3f97f801bc20273be76fa2ef53125d4;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/extensions/external_install_error.h b/src/chrome/browser/extensions/external_install_error.h index ff65e49..c26aa73 100644 --- a/src/chrome/browser/extensions/external_install_error.h +++ b/src/chrome/browser/extensions/external_install_error.h @@ -14,6 +14,7 @@ #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h" class Browser; +class ExtensionInstallPromptShowParams; class ExtensionInstallUI; class GlobalError; class GlobalErrorService; @@ -48,11 +49,11 @@ class ExternalInstallError : public ExtensionInstallPrompt::Delegate, const std::string& extension_id, AlertType error_type, ExternalInstallManager* manager); - virtual ~ExternalInstallError(); + ~ExternalInstallError() override; // ExtensionInstallPrompt::Delegate implementation. - virtual void InstallUIProceed() OVERRIDE; - virtual void InstallUIAbort(bool user_initiated) OVERRIDE; + void InstallUIProceed() override; + void InstallUIAbort(bool user_initiated) override; // Show the associated dialog. This should only be called once the dialog is // ready. @@ -66,18 +67,17 @@ class ExternalInstallError : public ExtensionInstallPrompt::Delegate, private: // WebstoreDataFetcherDelegate implementation. - virtual void OnWebstoreRequestFailure() OVERRIDE; - virtual void OnWebstoreResponseParseSuccess( - scoped_ptr webstore_data) OVERRIDE; - virtual void OnWebstoreResponseParseFailure( - const std::string& error) OVERRIDE; + void OnWebstoreRequestFailure() override; + void OnWebstoreResponseParseSuccess( + scoped_ptr webstore_data) override; + void OnWebstoreResponseParseFailure(const std::string& error) override; // Called when data fetching has completed (either successfully or not). void OnFetchComplete(); // Called when the dialog has been successfully populated, and is ready to be // shown. - void OnDialogReady(const ExtensionInstallPrompt::ShowParams& show_params, + void OnDialogReady(ExtensionInstallPromptShowParams* show_params, ExtensionInstallPrompt::Delegate* prompt_delegate, scoped_refptr prompt); @@ -98,6 +98,7 @@ class ExternalInstallError : public ExtensionInstallPrompt::Delegate, // The UI for showing the error. scoped_ptr install_ui_; + scoped_ptr install_ui_show_params_; scoped_refptr prompt_; // The UI for the given error, which will take the form of either a menu