| Index: android_webview/browser/browser_view_renderer.h
|
| diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
|
| index 717225e6cfeb5035d3d7f1b84b990f72d2adce41..f4c30c98b2ffdac6f7830c4b7dedde94b06be10c 100644
|
| --- a/android_webview/browser/browser_view_renderer.h
|
| +++ b/android_webview/browser/browser_view_renderer.h
|
| @@ -118,30 +118,30 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
|
|
|
| // SynchronousCompositorClient overrides.
|
| virtual void DidInitializeCompositor(
|
| - content::SynchronousCompositor* compositor) OVERRIDE;
|
| + content::SynchronousCompositor* compositor) override;
|
| virtual void DidDestroyCompositor(content::SynchronousCompositor* compositor)
|
| - OVERRIDE;
|
| - virtual void SetContinuousInvalidate(bool invalidate) OVERRIDE;
|
| - virtual void DidUpdateContent() OVERRIDE;
|
| - virtual gfx::Vector2dF GetTotalRootLayerScrollOffset() OVERRIDE;
|
| + override;
|
| + virtual void SetContinuousInvalidate(bool invalidate) override;
|
| + virtual void DidUpdateContent() override;
|
| + virtual gfx::Vector2dF GetTotalRootLayerScrollOffset() override;
|
| virtual void UpdateRootLayerState(
|
| const gfx::Vector2dF& total_scroll_offset_dip,
|
| const gfx::Vector2dF& max_scroll_offset_dip,
|
| const gfx::SizeF& scrollable_size_dip,
|
| float page_scale_factor,
|
| float min_page_scale_factor,
|
| - float max_page_scale_factor) OVERRIDE;
|
| - virtual bool IsExternalFlingActive() const OVERRIDE;
|
| + float max_page_scale_factor) override;
|
| + virtual bool IsExternalFlingActive() const override;
|
| virtual void DidOverscroll(gfx::Vector2dF accumulated_overscroll,
|
| gfx::Vector2dF latest_overscroll_delta,
|
| - gfx::Vector2dF current_fling_velocity) OVERRIDE;
|
| + gfx::Vector2dF current_fling_velocity) override;
|
|
|
| // GlobalTileManagerClient overrides.
|
| virtual content::SynchronousCompositorMemoryPolicy GetMemoryPolicy()
|
| - const OVERRIDE;
|
| + const override;
|
| virtual void SetMemoryPolicy(
|
| content::SynchronousCompositorMemoryPolicy new_policy,
|
| - bool effective_immediately) OVERRIDE;
|
| + bool effective_immediately) override;
|
|
|
| void UpdateParentDrawConstraints();
|
|
|
|
|