ui/views/widget/desktop_aura/desktop_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/views/widget/desktop_aura/desktop_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

« no previous file with comments | « ui/views/widget/desktop_aura/desktop_event_client.h ('k') | ui/views/widget/desktop_aura/desktop_native_cursor_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_focus_rules.h

diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules.h b/ui/views/widget/desktop_aura/desktop_focus_rules.h

index e096e80998df283ad92b62dd61aba811c4f8af5e..a1f32e1e7c0fb4b2cb3a50f5912484c045c3f32b 100644

--- a/ui/views/widget/desktop_aura/desktop_focus_rules.h

+++ b/ui/views/widget/desktop_aura/desktop_focus_rules.h

@@ -16,13 +16,13 @@ class DesktopFocusRules : public wm::BaseFocusRules {

private:

// Overridden from wm::BaseFocusRules:

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

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

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

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

virtual bool IsWindowConsideredVisibleForActivation(

- aura::Window* window) const OVERRIDE;

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

+ aura::Window* window) const override;

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

virtual aura::Window* GetNextActivatableWindow(

- aura::Window* window) const OVERRIDE;

+ aura::Window* window) const override;

// The content window. This is an activatable window even though it is a

// child.