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

Unified Diff: android_webview/native/aw_contents.h

Issue 623833003: replace OVERRIDE and FINAL with override and final in android_webview/ (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 | « android_webview/native/aw_autofill_client.h ('k') | android_webview/native/aw_contents_client_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_contents.h
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index a390375b880fb737a00573dd0830addeb6a3dfdc..e49d842d57fa412e5b703e3f74a7e89c997db9d3 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -136,9 +136,9 @@ class AwContents : public FindHelper::Listener,
jstring origin);
// PermissionRequestHandlerClient implementation.
- virtual void OnPermissionRequest(AwPermissionRequest* request) OVERRIDE;
+ virtual void OnPermissionRequest(AwPermissionRequest* request) override;
virtual void OnPermissionRequestCanceled(
- AwPermissionRequest* request) OVERRIDE;
+ AwPermissionRequest* request) override;
PermissionRequestHandler* GetPermissionRequestHandler() {
return permission_request_handler_.get();
@@ -152,14 +152,14 @@ class AwContents : public FindHelper::Listener,
// AwBrowserPermissionRequestDelegate implementation.
virtual void RequestProtectedMediaIdentifierPermission(
const GURL& origin,
- const base::Callback<void(bool)>& callback) OVERRIDE;
+ const base::Callback<void(bool)>& callback) override;
virtual void CancelProtectedMediaIdentifierPermissionRequests(
- const GURL& origin) OVERRIDE;
+ const GURL& origin) override;
virtual void RequestGeolocationPermission(
const GURL& origin,
- const base::Callback<void(bool)>& callback) OVERRIDE;
+ const base::Callback<void(bool)>& callback) override;
virtual void CancelGeolocationPermissionRequests(
- const GURL& origin) OVERRIDE;
+ const GURL& origin) override;
// Find-in-page API and related methods.
@@ -174,34 +174,34 @@ class AwContents : public FindHelper::Listener,
// FindHelper::Listener implementation.
virtual void OnFindResultReceived(int active_ordinal,
int match_count,
- bool finished) OVERRIDE;
+ bool finished) override;
// IconHelper::Listener implementation.
- virtual bool ShouldDownloadFavicon(const GURL& icon_url) OVERRIDE;
+ virtual bool ShouldDownloadFavicon(const GURL& icon_url) override;
virtual void OnReceivedIcon(const GURL& icon_url,
- const SkBitmap& bitmap) OVERRIDE;
+ const SkBitmap& bitmap) override;
virtual void OnReceivedTouchIconUrl(const std::string& url,
- const bool precomposed) OVERRIDE;
+ const bool precomposed) override;
// AwRenderViewHostExtClient implementation.
virtual void OnWebLayoutPageScaleFactorChanged(
- float page_scale_factor) OVERRIDE;
+ float page_scale_factor) override;
virtual void OnWebLayoutContentsSizeChanged(
- const gfx::Size& contents_size) OVERRIDE;
+ const gfx::Size& contents_size) override;
// BrowserViewRendererClient implementation.
- virtual bool RequestDrawGL(jobject canvas, bool wait_for_completion) OVERRIDE;
- virtual void PostInvalidate() OVERRIDE;
- virtual void UpdateParentDrawConstraints() OVERRIDE;
- virtual void OnNewPicture() OVERRIDE;
- virtual gfx::Point GetLocationOnScreen() OVERRIDE;
- virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE;
- virtual bool IsFlingActive() const OVERRIDE;
+ virtual bool RequestDrawGL(jobject canvas, bool wait_for_completion) override;
+ virtual void PostInvalidate() override;
+ virtual void UpdateParentDrawConstraints() override;
+ virtual void OnNewPicture() override;
+ virtual gfx::Point GetLocationOnScreen() override;
+ virtual void ScrollContainerViewTo(gfx::Vector2d new_value) override;
+ virtual bool IsFlingActive() const override;
virtual void UpdateScrollState(gfx::Vector2d max_scroll_offset,
gfx::SizeF contents_size_dip,
float page_scale_factor,
float min_page_scale_factor,
- float max_page_scale_factor) OVERRIDE;
- virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE;
+ float max_page_scale_factor) override;
+ virtual void DidOverscroll(gfx::Vector2d overscroll_delta) override;
const BrowserViewRenderer* GetBrowserViewRenderer() const;
« no previous file with comments | « android_webview/native/aw_autofill_client.h ('k') | android_webview/native/aw_contents_client_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698