| Index: chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
|
| diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
|
| index e977a9658983e36bcefdd9de4b32def31341c955..e8075827d3d0a7b26dd796be9ca97fcd6895411d 100644
|
| --- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
|
| +++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
|
| @@ -88,37 +88,33 @@ class ChromeJavaScriptDialogManager : public JavaScriptDialogManager {
|
| public:
|
| static ChromeJavaScriptDialogManager* GetInstance();
|
|
|
| - virtual void RunJavaScriptDialog(
|
| - WebContents* web_contents,
|
| - const GURL& origin_url,
|
| - const std::string& accept_lang,
|
| - content::JavaScriptMessageType message_type,
|
| - const base::string16& message_text,
|
| - const base::string16& default_prompt_text,
|
| - const DialogClosedCallback& callback,
|
| - bool* did_suppress_message) override;
|
| -
|
| - virtual void RunBeforeUnloadDialog(
|
| - WebContents* web_contents,
|
| - const base::string16& message_text,
|
| - bool is_reload,
|
| - const DialogClosedCallback& callback) override;
|
| -
|
| - virtual bool HandleJavaScriptDialog(
|
| - WebContents* web_contents,
|
| - bool accept,
|
| - const base::string16* prompt_override) override;
|
| -
|
| - virtual void CancelActiveAndPendingDialogs(
|
| - WebContents* web_contents) override;
|
| -
|
| - virtual void WebContentsDestroyed(WebContents* web_contents) override;
|
| + void RunJavaScriptDialog(WebContents* web_contents,
|
| + const GURL& origin_url,
|
| + const std::string& accept_lang,
|
| + content::JavaScriptMessageType message_type,
|
| + const base::string16& message_text,
|
| + const base::string16& default_prompt_text,
|
| + const DialogClosedCallback& callback,
|
| + bool* did_suppress_message) override;
|
| +
|
| + void RunBeforeUnloadDialog(WebContents* web_contents,
|
| + const base::string16& message_text,
|
| + bool is_reload,
|
| + const DialogClosedCallback& callback) override;
|
| +
|
| + bool HandleJavaScriptDialog(WebContents* web_contents,
|
| + bool accept,
|
| + const base::string16* prompt_override) override;
|
| +
|
| + void CancelActiveAndPendingDialogs(WebContents* web_contents) override;
|
| +
|
| + void WebContentsDestroyed(WebContents* web_contents) override;
|
|
|
| private:
|
| friend struct DefaultSingletonTraits<ChromeJavaScriptDialogManager>;
|
|
|
| ChromeJavaScriptDialogManager();
|
| - virtual ~ChromeJavaScriptDialogManager();
|
| + ~ChromeJavaScriptDialogManager() override;
|
|
|
| base::string16 GetTitle(WebContents* web_contents,
|
| const GURL& origin_url,
|
|
|