ash/shell/window_watcher.h - Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/

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: ash/shell/window_watcher.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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

Index: ash/shell/window_watcher.h

diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h

index 50cd9e41dd40574bce566f7f28c71b0315826f21..1aa9125d02772da38406789f0e61d0e90d8e7d74 100644

--- a/ash/shell/window_watcher.h

+++ b/ash/shell/window_watcher.h

@@ -34,14 +34,14 @@ class WindowWatcher : public aura::WindowObserver,

aura::Window* GetWindowByID(ash::ShelfID id);

// aura::WindowObserver overrides:

- virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;

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

+ virtual void OnWindowAdded(aura::Window* new_window) override;

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

// gfx::DisplayObserver overrides:

- virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;

- virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;

+ virtual void OnDisplayAdded(const gfx::Display& new_display) override;

+ virtual void OnDisplayRemoved(const gfx::Display& old_display) override;

virtual void OnDisplayMetricsChanged(const gfx::Display& display,

- uint32_t metrics) OVERRIDE;

+ uint32_t metrics) override;

private:

class WorkspaceWindowWatcher;

« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | ash/shell/window_watcher.cc » ('j') | no next file with comments »