| Index: content/browser/android/content_view_core_impl.h
|
| diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
|
| index 9887c0e404b0114a9230ed62797ffa8ea69b4bf2..cfa424bce77f6997b69c8ac3531f9452098e242c 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -47,25 +47,25 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| jobject java_bridge_retained_object_set);
|
|
|
| // ContentViewCore implementation.
|
| - virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
|
| - virtual WebContents* GetWebContents() const OVERRIDE;
|
| - virtual ui::ViewAndroid* GetViewAndroid() const OVERRIDE;
|
| - virtual ui::WindowAndroid* GetWindowAndroid() const OVERRIDE;
|
| - virtual scoped_refptr<cc::Layer> GetLayer() const OVERRIDE;
|
| - virtual void ShowPastePopup(int x, int y) OVERRIDE;
|
| + virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
|
| + virtual WebContents* GetWebContents() const override;
|
| + virtual ui::ViewAndroid* GetViewAndroid() const override;
|
| + virtual ui::WindowAndroid* GetWindowAndroid() const override;
|
| + virtual scoped_refptr<cc::Layer> GetLayer() const override;
|
| + virtual void ShowPastePopup(int x, int y) override;
|
| virtual void GetScaledContentBitmap(
|
| float scale,
|
| SkColorType color_type,
|
| gfx::Rect src_subrect,
|
| const base::Callback<void(bool, const SkBitmap&)>& result_callback)
|
| - OVERRIDE;
|
| - virtual float GetDpiScale() const OVERRIDE;
|
| - virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE;
|
| + override;
|
| + virtual float GetDpiScale() const override;
|
| + virtual void PauseOrResumeGeolocation(bool should_pause) override;
|
| virtual void RequestTextSurroundingSelection(
|
| int max_length,
|
| const base::Callback<void(const base::string16& content,
|
| int start_offset,
|
| - int end_offset)>& callback) OVERRIDE;
|
| + int end_offset)>& callback) override;
|
|
|
| // --------------------------------------------------------------------------
|
| // Methods called from Java via JNI
|
| @@ -284,10 +284,10 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| virtual ~ContentViewCoreImpl();
|
|
|
| // WebContentsObserver implementation.
|
| - virtual void RenderViewReady() OVERRIDE;
|
| + virtual void RenderViewReady() override;
|
| virtual void RenderViewHostChanged(RenderViewHost* old_host,
|
| - RenderViewHost* new_host) OVERRIDE;
|
| - virtual void WebContentsDestroyed() OVERRIDE;
|
| + RenderViewHost* new_host) override;
|
| + virtual void WebContentsDestroyed() override;
|
|
|
| // --------------------------------------------------------------------------
|
| // Other private methods and data
|
|
|