| Index: ash/keyboard_overlay/keyboard_overlay_delegate.h
|
| diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate.h b/ash/keyboard_overlay/keyboard_overlay_delegate.h
|
| index d9f8cf2bb2b25d9a235584ec9ad15dcf370aa5bf..ef92dead1636aff67bc70990dd7275be481f123e 100644
|
| --- a/ash/keyboard_overlay/keyboard_overlay_delegate.h
|
| +++ b/ash/keyboard_overlay/keyboard_overlay_delegate.h
|
| @@ -29,26 +29,25 @@ class ASH_WITH_CONTENT_EXPORT KeyboardOverlayDelegate
|
| views::Widget* Show(views::WebDialogView* view);
|
|
|
| // Overridden from ui::WebDialogDelegate:
|
| - virtual void GetDialogSize(gfx::Size* size) const override;
|
| + void GetDialogSize(gfx::Size* size) const override;
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayDelegateTest, ShowAndClose);
|
|
|
| - virtual ~KeyboardOverlayDelegate();
|
| + ~KeyboardOverlayDelegate() override;
|
|
|
| // Overridden from ui::WebDialogDelegate:
|
| - 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<content::WebUIMessageHandler*>* handlers) const override;
|
| - virtual std::string GetDialogArgs() const override;
|
| - virtual void OnDialogClosed(const std::string& json_retval) override;
|
| - virtual void OnCloseContents(content::WebContents* source,
|
| - bool* out_close_dialog) override;
|
| - virtual bool ShouldShowDialogTitle() const override;
|
| - virtual bool HandleContextMenu(
|
| - const content::ContextMenuParams& params) override;
|
| + std::string GetDialogArgs() const override;
|
| + void OnDialogClosed(const std::string& json_retval) override;
|
| + void OnCloseContents(content::WebContents* source,
|
| + bool* out_close_dialog) override;
|
| + bool ShouldShowDialogTitle() const override;
|
| + bool HandleContextMenu(const content::ContextMenuParams& params) override;
|
|
|
| // The dialog title.
|
| base::string16 title_;
|
|
|