ui/views/widget/desktop_aura/x11_desktop_handler.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/x11_desktop_handler.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_window_tree_host_x11_unittest.cc ('k') | ui/views/widget/desktop_aura/x11_desktop_window_move_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e97b68af60df3201c5c35e8edefa8efe3427734f..8a1e61e109c606026eb9b22900d759cf8a82572e 100644

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

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

@@ -57,12 +57,12 @@ class VIEWS_EXPORT X11DesktopHandler : public ui::PlatformEventDispatcher,

void ProcessXEvent(XEvent* event);

// ui::PlatformEventDispatcher

- virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;

- virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;

+ virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;

+ virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;

// Overridden from aura::EnvObserver:

- virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;

- virtual void OnWillDestroyEnv() OVERRIDE;

+ virtual void OnWindowInitialized(aura::Window* window) override;

+ virtual void OnWillDestroyEnv() override;

private:

enum ActiveState {