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

Unified Diff: android_webview/native/aw_contents.h

Issue 893343002: 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 | « 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 8987dc22ebfdabadd1bfd64155da6819bc612a72..7110ebab8278a3ed41f5ad9c07cd2dd12401dc41 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -69,7 +69,7 @@ class AwContents : public FindHelper::Listener,
static AwContents* FromID(int render_process_id, int render_view_id);
AwContents(scoped_ptr<content::WebContents> web_contents);
- virtual ~AwContents();
+ ~AwContents() override;
AwRenderViewHostExt* render_view_host_ext() {
return render_view_host_ext_.get();
@@ -139,9 +139,8 @@ class AwContents : public FindHelper::Listener,
jstring origin);
// PermissionRequestHandlerClient implementation.
- virtual void OnPermissionRequest(AwPermissionRequest* request) override;
- virtual void OnPermissionRequestCanceled(
- AwPermissionRequest* request) override;
+ void OnPermissionRequest(AwPermissionRequest* request) override;
+ void OnPermissionRequestCanceled(AwPermissionRequest* request) override;
PermissionRequestHandler* GetPermissionRequestHandler() {
return permission_request_handler_.get();
@@ -153,17 +152,15 @@ class AwContents : public FindHelper::Listener,
jlong resources);
// AwBrowserPermissionRequestDelegate implementation.
- virtual void RequestProtectedMediaIdentifierPermission(
+ void RequestProtectedMediaIdentifierPermission(
const GURL& origin,
const base::Callback<void(bool)>& callback) override;
- virtual void CancelProtectedMediaIdentifierPermissionRequests(
+ void CancelProtectedMediaIdentifierPermissionRequests(
const GURL& origin) override;
- virtual void RequestGeolocationPermission(
+ void RequestGeolocationPermission(
const GURL& origin,
const base::Callback<void(bool)>& callback) override;
- virtual void CancelGeolocationPermissionRequests(
- const GURL& origin) override;
-
+ void CancelGeolocationPermissionRequests(const GURL& origin) override;
// Find-in-page API and related methods.
void FindAllAsync(JNIEnv* env, jobject obj, jstring search_string);
@@ -175,36 +172,33 @@ class AwContents : public FindHelper::Listener,
bool AllowThirdPartyCookies();
// FindHelper::Listener implementation.
- virtual void OnFindResultReceived(int active_ordinal,
- int match_count,
- bool finished) override;
+ void OnFindResultReceived(int active_ordinal,
+ int match_count,
+ bool finished) override;
// IconHelper::Listener implementation.
- virtual bool ShouldDownloadFavicon(const GURL& icon_url) override;
- virtual void OnReceivedIcon(const GURL& icon_url,
- const SkBitmap& bitmap) override;
- virtual void OnReceivedTouchIconUrl(const std::string& url,
- const bool precomposed) override;
+ bool ShouldDownloadFavicon(const GURL& icon_url) override;
+ void OnReceivedIcon(const GURL& icon_url, const SkBitmap& bitmap) override;
+ void OnReceivedTouchIconUrl(const std::string& url,
+ const bool precomposed) override;
// AwRenderViewHostExtClient implementation.
- virtual void OnWebLayoutPageScaleFactorChanged(
- float page_scale_factor) override;
- virtual void OnWebLayoutContentsSizeChanged(
- const gfx::Size& contents_size) override;
+ void OnWebLayoutPageScaleFactorChanged(float page_scale_factor) override;
+ void OnWebLayoutContentsSizeChanged(const gfx::Size& contents_size) override;
// BrowserViewRendererClient implementation.
- virtual bool RequestDrawGL(bool wait_for_completion) override;
- virtual void PostInvalidate() override;
- virtual void InvalidateOnFunctorDestroy() 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;
+ bool RequestDrawGL(bool wait_for_completion) override;
+ void PostInvalidate() override;
+ void InvalidateOnFunctorDestroy() override;
+ void OnNewPicture() override;
+ gfx::Point GetLocationOnScreen() override;
+ void ScrollContainerViewTo(gfx::Vector2d new_value) override;
+ bool IsFlingActive() const override;
+ 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;
+ 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