| Index: ui/views/controls/webview/web_dialog_view.h
|
| diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h
|
| index 2e69ad314bad7fdef8ac28cdca5f1a9a1c560312..40d7616e62eee861bd101cbe0dac8322ee065c89 100644
|
| --- a/ui/views/controls/webview/web_dialog_view.h
|
| +++ b/ui/views/controls/webview/web_dialog_view.h
|
| @@ -52,69 +52,69 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,
|
| content::WebContents* web_contents();
|
|
|
| // Overridden from views::ClientView:
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| - virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
| + virtual gfx::Size GetMinimumSize() const override;
|
| virtual bool AcceleratorPressed(const ui::Accelerator& accelerator)
|
| - OVERRIDE;
|
| + override;
|
| virtual void ViewHierarchyChanged(
|
| - const ViewHierarchyChangedDetails& details) OVERRIDE;
|
| - virtual bool CanClose() OVERRIDE;
|
| + const ViewHierarchyChangedDetails& details) override;
|
| + virtual bool CanClose() override;
|
|
|
| // Overridden from views::WidgetDelegate:
|
| - virtual bool CanResize() const OVERRIDE;
|
| - virtual ui::ModalType GetModalType() const OVERRIDE;
|
| - virtual base::string16 GetWindowTitle() const OVERRIDE;
|
| - virtual std::string GetWindowName() const OVERRIDE;
|
| - virtual void WindowClosing() OVERRIDE;
|
| - virtual views::View* GetContentsView() OVERRIDE;
|
| - virtual ClientView* CreateClientView(views::Widget* widget) OVERRIDE;
|
| - virtual views::View* GetInitiallyFocusedView() OVERRIDE;
|
| - virtual bool ShouldShowWindowTitle() const OVERRIDE;
|
| - virtual views::Widget* GetWidget() OVERRIDE;
|
| - virtual const views::Widget* GetWidget() const OVERRIDE;
|
| + virtual bool CanResize() const override;
|
| + virtual ui::ModalType GetModalType() const override;
|
| + virtual base::string16 GetWindowTitle() const override;
|
| + virtual std::string GetWindowName() const override;
|
| + virtual void WindowClosing() override;
|
| + virtual views::View* GetContentsView() override;
|
| + virtual ClientView* CreateClientView(views::Widget* widget) override;
|
| + virtual views::View* GetInitiallyFocusedView() override;
|
| + virtual bool ShouldShowWindowTitle() const override;
|
| + virtual views::Widget* GetWidget() override;
|
| + virtual const views::Widget* GetWidget() const override;
|
|
|
| // Overridden from ui::WebDialogDelegate:
|
| - virtual ui::ModalType GetDialogModalType() const OVERRIDE;
|
| - virtual base::string16 GetDialogTitle() const OVERRIDE;
|
| - virtual GURL GetDialogContentURL() const OVERRIDE;
|
| + virtual ui::ModalType GetDialogModalType() const override;
|
| + virtual base::string16 GetDialogTitle() const override;
|
| + virtual GURL GetDialogContentURL() const override;
|
| virtual void GetWebUIMessageHandlers(
|
| - std::vector<content::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;
|
| + std::vector<content::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 OnDialogShown(
|
| content::WebUI* webui,
|
| - content::RenderViewHost* render_view_host) OVERRIDE;
|
| - virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
|
| + content::RenderViewHost* render_view_host) override;
|
| + virtual void OnDialogClosed(const std::string& json_retval) override;
|
| virtual void OnDialogCloseFromWebUI(
|
| - const std::string& json_retval) OVERRIDE;
|
| + const std::string& json_retval) override;
|
| virtual void OnCloseContents(content::WebContents* source,
|
| - bool* out_close_dialog) OVERRIDE;
|
| - virtual bool ShouldShowDialogTitle() const OVERRIDE;
|
| + bool* out_close_dialog) override;
|
| + virtual bool ShouldShowDialogTitle() const override;
|
| virtual bool HandleContextMenu(
|
| - const content::ContextMenuParams& params) OVERRIDE;
|
| + const content::ContextMenuParams& params) override;
|
|
|
| // Overridden from content::WebContentsDelegate:
|
| virtual void MoveContents(content::WebContents* source,
|
| - const gfx::Rect& pos) OVERRIDE;
|
| + const gfx::Rect& pos) override;
|
| virtual void HandleKeyboardEvent(
|
| content::WebContents* source,
|
| - const content::NativeWebKeyboardEvent& event) OVERRIDE;
|
| - virtual void CloseContents(content::WebContents* source) OVERRIDE;
|
| + const content::NativeWebKeyboardEvent& event) override;
|
| + virtual void CloseContents(content::WebContents* source) override;
|
| virtual content::WebContents* OpenURLFromTab(
|
| content::WebContents* source,
|
| - const content::OpenURLParams& params) OVERRIDE;
|
| + 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;
|
| + bool* was_blocked) override;
|
| virtual void LoadingStateChanged(content::WebContents* source,
|
| - bool to_different_document) OVERRIDE;
|
| + bool to_different_document) override;
|
| virtual void BeforeUnloadFired(content::WebContents* tab,
|
| bool proceed,
|
| - bool* proceed_to_fire_unload) OVERRIDE;
|
| + bool* proceed_to_fire_unload) override;
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered);
|
|
|