chrome/browser/ui/cocoa/web_dialog_window_controller.mm - Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]*

Unified Diff: chrome/browser/ui/cocoa/web_dialog_window_controller.mm

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm ('k') | chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 fd8384928f15e02bde09f8aee265eda33e26cccb..111212a046de741332f3546bea4fad99df5062d2 100644

--- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm

+++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm

@@ -44,36 +44,36 @@ public:

void WindowControllerClosed();

// WebDialogDelegate declarations.

- 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<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;

+ 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; }

+ bool* out_close_dialog) override;

+ virtual bool ShouldShowDialogTitle() const override { return true; }

// WebDialogWebContentsDelegate declarations.

- virtual void MoveContents(WebContents* source, const gfx::Rect& pos) OVERRIDE;

+ 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;

+ const NativeWebKeyboardEvent& event) override;

+ virtual void CloseContents(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;

private:

WebDialogWindowController* controller_; // weak