ui/wm/core/base_focus_rules.h - Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/wm/core/base_focus_rules.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase on master 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

Index: ui/wm/core/base_focus_rules.h

diff --git a/ui/wm/core/base_focus_rules.h b/ui/wm/core/base_focus_rules.h

index 07dfb65fbc926c9ff780f576cb725b674cd8bbe4..80735410834be2c601e2030343756b5931dfef8a 100644

--- a/ui/wm/core/base_focus_rules.h

+++ b/ui/wm/core/base_focus_rules.h

@@ -26,15 +26,15 @@ class WM_EXPORT BaseFocusRules : public FocusRules {

aura::Window* window) const;

// Overridden from FocusRules:

- virtual bool IsToplevelWindow(aura::Window* window) const OVERRIDE;

- virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;

- virtual bool CanFocusWindow(aura::Window* window) const OVERRIDE;

- virtual aura::Window* GetToplevelWindow(aura::Window* window) const OVERRIDE;

+ virtual bool IsToplevelWindow(aura::Window* window) const override;

+ virtual bool CanActivateWindow(aura::Window* window) const override;

+ virtual bool CanFocusWindow(aura::Window* window) const override;

+ virtual aura::Window* GetToplevelWindow(aura::Window* window) const override;

virtual aura::Window* GetActivatableWindow(

- aura::Window* window) const OVERRIDE;

- virtual aura::Window* GetFocusableWindow(aura::Window* window) const OVERRIDE;

+ aura::Window* window) const override;

+ virtual aura::Window* GetFocusableWindow(aura::Window* window) const override;

virtual aura::Window* GetNextActivatableWindow(

- aura::Window* ignore) const OVERRIDE;

+ aura::Window* ignore) const override;

private:

DISALLOW_COPY_AND_ASSIGN(BaseFocusRules);

« no previous file with comments | « ui/wm/core/accelerator_filter.h ('k') | ui/wm/core/capture_controller.h » ('j') | no next file with comments »