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

Unified Diff: ash/host/ash_window_tree_host_x11.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/host/ash_window_tree_host_win.cc ('k') | ash/host/ash_window_tree_host_x11_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_x11.h
diff --git a/ash/host/ash_window_tree_host_x11.h b/ash/host/ash_window_tree_host_x11.h
index 1a3335dd10aca53a4715b9d68411d91ff7c4be87..3fc4e2bfa5ba0745b64f2c901b05a0ccee45b6c4 100644
--- a/ash/host/ash_window_tree_host_x11.h
+++ b/ash/host/ash_window_tree_host_x11.h
@@ -25,33 +25,33 @@ class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost,
private:
// AshWindowTreeHost:
- virtual void ToggleFullScreen() OVERRIDE;
- virtual bool ConfineCursorToRootWindow() OVERRIDE;
- virtual void UnConfineCursor() OVERRIDE;
+ virtual void ToggleFullScreen() override;
+ virtual bool ConfineCursorToRootWindow() override;
+ virtual void UnConfineCursor() override;
virtual void SetRootWindowTransformer(
- scoped_ptr<RootWindowTransformer> transformer) OVERRIDE;
- virtual gfx::Insets GetHostInsets() const OVERRIDE;
- virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE;
- virtual void UpdateDisplayID(int64 id1, int64 id2) OVERRIDE;
- virtual void PrepareForShutdown() OVERRIDE;
+ scoped_ptr<RootWindowTransformer> transformer) override;
+ virtual gfx::Insets GetHostInsets() const override;
+ virtual aura::WindowTreeHost* AsWindowTreeHost() override;
+ virtual void UpdateDisplayID(int64 id1, int64 id2) override;
+ virtual void PrepareForShutdown() override;
// aura::WindowTreehost:
- virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
- virtual gfx::Transform GetRootTransform() const OVERRIDE;
- virtual void SetRootTransform(const gfx::Transform& transform) OVERRIDE;
- virtual gfx::Transform GetInverseRootTransform() const OVERRIDE;
- virtual void UpdateRootWindowSize(const gfx::Size& host_size) OVERRIDE;
- virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
+ virtual void SetBounds(const gfx::Rect& bounds) override;
+ virtual gfx::Transform GetRootTransform() const override;
+ virtual void SetRootTransform(const gfx::Transform& transform) override;
+ virtual gfx::Transform GetInverseRootTransform() const override;
+ virtual void UpdateRootWindowSize(const gfx::Size& host_size) override;
+ virtual void OnCursorVisibilityChangedNative(bool show) override;
// aura::WindowTreeHostX11:
- virtual void OnConfigureNotify() OVERRIDE;
- virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
+ virtual void OnConfigureNotify() override;
+ virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event)
- OVERRIDE;
+ override;
// EnvObserver overrides.
- virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
- virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE;
+ virtual void OnWindowInitialized(aura::Window* window) override;
+ virtual void OnHostInitialized(aura::WindowTreeHost* host) override;
#if defined(OS_CHROMEOS)
// Set the CrOS touchpad "tap paused" property. It is used to temporarily
« no previous file with comments | « ash/host/ash_window_tree_host_win.cc ('k') | ash/host/ash_window_tree_host_x11_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698