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

Unified Diff: content/browser/android/content_view_core_impl.h

Issue 897773002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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 | « content/browser/android/content_settings.h ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 053e0e7a9682fa4daa761f26b11c22b9bf8a3b40..691a659933646ebe8ebb7a22442c635fdeff86ea 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -47,20 +47,20 @@ 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 const scoped_refptr<cc::Layer>& GetLayer() const override;
- virtual void ShowPastePopup(int x, int y) override;
- virtual void GetScaledContentBitmap(
+ base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
+ WebContents* GetWebContents() const override;
+ ui::ViewAndroid* GetViewAndroid() const override;
+ ui::WindowAndroid* GetWindowAndroid() const override;
+ const scoped_refptr<cc::Layer>& GetLayer() const override;
+ void ShowPastePopup(int x, int y) override;
+ void GetScaledContentBitmap(
float scale,
SkColorType color_type,
gfx::Rect src_subrect,
ReadbackRequestCallback& result_callback) override;
- virtual float GetDpiScale() const override;
- virtual void PauseOrResumeGeolocation(bool should_pause) override;
- virtual void RequestTextSurroundingSelection(
+ float GetDpiScale() const override;
+ void PauseOrResumeGeolocation(bool should_pause) override;
+ void RequestTextSurroundingSelection(
int max_length,
const base::Callback<void(const base::string16& content,
int start_offset,
@@ -285,13 +285,13 @@ class ContentViewCoreImpl : public ContentViewCore,
class ContentViewUserData;
friend class ContentViewUserData;
- virtual ~ContentViewCoreImpl();
+ ~ContentViewCoreImpl() override;
// WebContentsObserver implementation.
- virtual void RenderViewReady() override;
- virtual void RenderViewHostChanged(RenderViewHost* old_host,
- RenderViewHost* new_host) override;
- virtual void WebContentsDestroyed() override;
+ void RenderViewReady() override;
+ void RenderViewHostChanged(RenderViewHost* old_host,
+ RenderViewHost* new_host) override;
+ void WebContentsDestroyed() override;
// --------------------------------------------------------------------------
// Other private methods and data
« no previous file with comments | « content/browser/android/content_settings.h ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698