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

Unified Diff: ash/display/display_change_observer_chromeos.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
« no previous file with comments | « ash/display/cursor_window_controller.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 2edcf9c9e98b15f4325229788244bcf2aa110447..905db78b324296c46d978a231da9e6f42d16ca9b 100644
--- a/ash/display/display_change_observer_chromeos.h
+++ b/ash/display/display_change_observer_chromeos.h
@@ -37,19 +37,19 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
// ui::DisplayConfigurator::StateController overrides:
virtual ui::MultipleDisplayState GetStateForDisplayIds(
- const std::vector<int64>& outputs) const OVERRIDE;
+ const std::vector<int64>& outputs) const override;
virtual bool GetResolutionForDisplayId(int64 display_id,
- gfx::Size* size) const OVERRIDE;
+ gfx::Size* size) const override;
// Overriden from ui::DisplayConfigurator::Observer:
virtual void OnDisplayModeChanged(
- const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
+ const ui::DisplayConfigurator::DisplayStateList& outputs) override;
// Overriden from ui::InputDeviceEventObserver:
- virtual void OnInputDeviceConfigurationChanged() OVERRIDE;
+ virtual void OnInputDeviceConfigurationChanged() override;
// Overriden from ShellObserver:
- virtual void OnAppTerminating() OVERRIDE;
+ virtual void OnAppTerminating() override;
// Exposed for testing.
ASH_EXPORT static float FindDeviceScaleFactor(float dpi);
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/display/display_configurator_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698