Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(954)

Unified Diff: ash/display/display_change_observer_chromeos.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: Workaround 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/autoclick/autoclick_unittest.cc ('k') | ash/display/display_configurator_animation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos.h
diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
index ebb9e8ee4aba1af57f3e039d5990d8c823e62c06..a32afc5ac897919fd385369e6a4d181f146bb645 100644
--- a/ash/display/display_change_observer_chromeos.h
+++ b/ash/display/display_change_observer_chromeos.h
@@ -35,24 +35,24 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
const ui::DisplayConfigurator::DisplayState& output);
DisplayChangeObserver();
- virtual ~DisplayChangeObserver();
+ ~DisplayChangeObserver() override;
// ui::DisplayConfigurator::StateController overrides:
- virtual ui::MultipleDisplayState GetStateForDisplayIds(
+ ui::MultipleDisplayState GetStateForDisplayIds(
const std::vector<int64>& outputs) const override;
- virtual bool GetResolutionForDisplayId(int64 display_id,
- gfx::Size* size) const override;
+ bool GetResolutionForDisplayId(int64 display_id,
+ gfx::Size* size) const override;
// Overriden from ui::DisplayConfigurator::Observer:
- virtual void OnDisplayModeChanged(
+ void OnDisplayModeChanged(
const ui::DisplayConfigurator::DisplayStateList& outputs) override;
// Overriden from ui::InputDeviceEventObserver:
- virtual void OnTouchscreenDeviceConfigurationChanged() override;
- virtual void OnKeyboardDeviceConfigurationChanged() override;
+ void OnTouchscreenDeviceConfigurationChanged() override;
+ void OnKeyboardDeviceConfigurationChanged() override;
// Overriden from ShellObserver:
- virtual void OnAppTerminating() override;
+ void OnAppTerminating() override;
// Exposed for testing.
ASH_EXPORT static float FindDeviceScaleFactor(float dpi);
« no previous file with comments | « ash/autoclick/autoclick_unittest.cc ('k') | ash/display/display_configurator_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698