| Index: chrome/browser/ui/cocoa/web_dialog_window_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
|
| index 111212a046de741332f3546bea4fad99df5062d2..63cdd3456c5a39edb1515a1477c467cb1a8d4f53 100644
|
| --- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
|
| @@ -37,43 +37,41 @@ public:
|
| content::BrowserContext* context,
|
| WebDialogDelegate* delegate);
|
|
|
| - virtual ~WebDialogWindowDelegateBridge();
|
| + ~WebDialogWindowDelegateBridge() override;
|
|
|
| // Called when the window is directly closed, e.g. from the close
|
| // button or from an accelerator.
|
| void WindowControllerClosed();
|
|
|
| // WebDialogDelegate declarations.
|
| - virtual ui::ModalType GetDialogModalType() const override;
|
| - virtual base::string16 GetDialogTitle() const override;
|
| - virtual GURL GetDialogContentURL() const override;
|
| - virtual void GetWebUIMessageHandlers(
|
| + ui::ModalType GetDialogModalType() const override;
|
| + base::string16 GetDialogTitle() const override;
|
| + GURL GetDialogContentURL() const override;
|
| + void GetWebUIMessageHandlers(
|
| std::vector<WebUIMessageHandler*>* handlers) const override;
|
| - virtual void GetDialogSize(gfx::Size* size) const override;
|
| - virtual void GetMinimumDialogSize(gfx::Size* size) const override;
|
| - virtual std::string GetDialogArgs() const override;
|
| - virtual void OnDialogClosed(const std::string& json_retval) override;
|
| - virtual void OnCloseContents(WebContents* source,
|
| - bool* out_close_dialog) override;
|
| - virtual bool ShouldShowDialogTitle() const override { return true; }
|
| + void GetDialogSize(gfx::Size* size) const override;
|
| + void GetMinimumDialogSize(gfx::Size* size) const override;
|
| + std::string GetDialogArgs() const override;
|
| + void OnDialogClosed(const std::string& json_retval) override;
|
| + void OnCloseContents(WebContents* source, bool* out_close_dialog) override;
|
| + bool ShouldShowDialogTitle() const override { return true; }
|
|
|
| // WebDialogWebContentsDelegate declarations.
|
| - virtual void MoveContents(WebContents* source, const gfx::Rect& pos) override;
|
| - virtual void HandleKeyboardEvent(
|
| - content::WebContents* source,
|
| - const NativeWebKeyboardEvent& event) override;
|
| - virtual void CloseContents(WebContents* source) override;
|
| - virtual content::WebContents* OpenURLFromTab(
|
| + void MoveContents(WebContents* source, const gfx::Rect& pos) override;
|
| + void HandleKeyboardEvent(content::WebContents* source,
|
| + const NativeWebKeyboardEvent& event) override;
|
| + void CloseContents(WebContents* source) override;
|
| + content::WebContents* OpenURLFromTab(
|
| content::WebContents* source,
|
| const content::OpenURLParams& params) override;
|
| - virtual void AddNewContents(content::WebContents* source,
|
| - content::WebContents* new_contents,
|
| - WindowOpenDisposition disposition,
|
| - const gfx::Rect& initial_pos,
|
| - bool user_gesture,
|
| - bool* was_blocked) override;
|
| - virtual void LoadingStateChanged(content::WebContents* source,
|
| - bool to_different_document) override;
|
| + void AddNewContents(content::WebContents* source,
|
| + content::WebContents* new_contents,
|
| + WindowOpenDisposition disposition,
|
| + const gfx::Rect& initial_pos,
|
| + bool user_gesture,
|
| + bool* was_blocked) override;
|
| + void LoadingStateChanged(content::WebContents* source,
|
| + bool to_different_document) override;
|
|
|
| private:
|
| WebDialogWindowController* controller_; // weak
|
|
|