Index: ui/compositor/compositor.h |
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h |
index 72390d060364a7df0cf3ebc7fae271fd29b9c520..942625501b472177205b729fae19bbfa5fecb0c8 100644 |
--- a/ui/compositor/compositor.h |
+++ b/ui/compositor/compositor.h |
@@ -223,29 +223,29 @@ class COMPOSITOR_EXPORT Compositor |
void OnSwapBuffersAborted(); |
// LayerTreeHostClient implementation. |
- virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} |
- virtual void DidBeginMainFrame() OVERRIDE {} |
- virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; |
- virtual void Layout() OVERRIDE; |
+ virtual void WillBeginMainFrame(int frame_id) override {} |
+ virtual void DidBeginMainFrame() override {} |
+ virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override; |
+ virtual void Layout() override; |
virtual void ApplyViewportDeltas( |
const gfx::Vector2d& inner_delta, |
const gfx::Vector2d& outer_delta, |
float page_scale, |
- float top_controls_delta) OVERRIDE {} |
+ float top_controls_delta) override {} |
virtual void ApplyViewportDeltas( |
const gfx::Vector2d& scroll_delta, |
float page_scale, |
- float top_controls_delta) OVERRIDE {} |
- virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; |
- virtual void DidInitializeOutputSurface() OVERRIDE {} |
- virtual void WillCommit() OVERRIDE {} |
- virtual void DidCommit() OVERRIDE; |
- virtual void DidCommitAndDrawFrame() OVERRIDE; |
- virtual void DidCompleteSwapBuffers() OVERRIDE; |
+ float top_controls_delta) override {} |
+ virtual void RequestNewOutputSurface(bool fallback) override; |
+ virtual void DidInitializeOutputSurface() override {} |
+ virtual void WillCommit() override {} |
+ virtual void DidCommit() override; |
+ virtual void DidCommitAndDrawFrame() override; |
+ virtual void DidCompleteSwapBuffers() override; |
// cc::LayerTreeHostSingleThreadClient implementation. |
- virtual void DidPostSwapBuffers() OVERRIDE; |
- virtual void DidAbortSwapBuffers() OVERRIDE; |
+ virtual void DidPostSwapBuffers() override; |
+ virtual void DidAbortSwapBuffers() override; |
bool IsLocked() { return compositor_lock_ != NULL; } |