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

Unified Diff: ash/display/display_controller.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/display_configurator_animation.cc ('k') | ash/display/display_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_controller.h
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index a656d54d5c1f54f6395945161e0c0b0f784f2180..ec65fe0813b779e34d176a1b219770761d141fdd 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -144,20 +144,20 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window,
const gfx::Insets& insets);
// gfx::DisplayObserver overrides:
- virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
- virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
+ virtual void OnDisplayAdded(const gfx::Display& display) override;
+ virtual void OnDisplayRemoved(const gfx::Display& display) override;
virtual void OnDisplayMetricsChanged(const gfx::Display& display,
- uint32_t metrics) OVERRIDE;
+ uint32_t metrics) override;
// aura::WindowTreeHostObserver overrides:
- virtual void OnHostResized(const aura::WindowTreeHost* host) OVERRIDE;
+ virtual void OnHostResized(const aura::WindowTreeHost* host) override;
// aura::DisplayManager::Delegate overrides:
virtual void CreateOrUpdateNonDesktopDisplay(const DisplayInfo& info)
- OVERRIDE;
- virtual void CloseNonDesktopDisplay() OVERRIDE;
- virtual void PreDisplayConfigurationChange(bool clear_focus) OVERRIDE;
- virtual void PostDisplayConfigurationChange() OVERRIDE;
+ override;
+ virtual void CloseNonDesktopDisplay() override;
+ virtual void PreDisplayConfigurationChange(bool clear_focus) override;
+ virtual void PostDisplayConfigurationChange() override;
private:
FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated);
« no previous file with comments | « ash/display/display_configurator_animation.cc ('k') | ash/display/display_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698