diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 21:50:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 21:50:18 +0000 |
| commit | ca6e0a823730e79cf546491f7a548a684920480a (patch) | |
| tree | bd6463c0875f70e7149cf4edd84d3bea6fb2bf90 /android_webview | |
| parent | f120e9853776811f29342afca16766e21cf6c5c9 (diff) | |
| download | chromium_src-ca6e0a823730e79cf546491f7a548a684920480a.zip chromium_src-ca6e0a823730e79cf546491f7a548a684920480a.tar.gz chromium_src-ca6e0a823730e79cf546491f7a548a684920480a.tar.bz2 | |
remove OVERRIDE in android_webview as that breaks after a blink roll
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/renderer/aw_permission_client.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/renderer/aw_permission_client.h b/android_webview/renderer/aw_permission_client.h index 01b5345..08d61c2 100644 --- a/android_webview/renderer/aw_permission_client.h +++ b/android_webview/renderer/aw_permission_client.h @@ -25,12 +25,12 @@ class AwPermissionClient : public content::RenderFrameObserver, blink::WebFrame* frame, bool enabled_per_settings, const blink::WebSecurityOrigin& origin, - const blink::WebURL& url) OVERRIDE; + const blink::WebURL& url); virtual bool allowRunningInsecureContent( blink::WebFrame* frame, bool enabled_per_settings, const blink::WebSecurityOrigin& origin, - const blink::WebURL& url) OVERRIDE; + const blink::WebURL& url); virtual bool allowDisplayingInsecureContent( bool enabled_per_settings, |