ash/display/display_manager.h - Issue 800983006: Update {virtual,override,final} to follow C++11 style 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/display/display_manager.h

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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 | « ash/display/display_error_observer_chromeos_unittest.cc ('k') | ash/display/display_manager_unittest.cc » ('j') | ash/system/chromeos/screen_security/screen_tray_item.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/display/display_manager.h

diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h

index d9e4efa27c78427b23d04e1228092cbc5d6c6aef..61f391b2e98d5d0a95aafb3da53e6539bd5c6fa3 100644

--- a/ash/display/display_manager.h

+++ b/ash/display/display_manager.h

@@ -78,7 +78,7 @@ class ASH_EXPORT DisplayManager

};

DisplayManager();

- virtual ~DisplayManager();

+ ~DisplayManager() override;

DisplayLayoutStore* layout_store() {

return layout_store_.get();

@@ -270,8 +270,8 @@ class ASH_EXPORT DisplayManager

// SoftwareMirroringController override:

#if defined(OS_CHROMEOS)

- virtual void SetSoftwareMirroring(bool enabled) override;

- virtual bool SoftwareMirroringEnabled() const override;

+ void SetSoftwareMirroring(bool enabled) override;

+ bool SoftwareMirroringEnabled() const override;

#endif

bool software_mirroring_enabled() const {

return second_display_mode_ == MIRRORING;