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

Side by Side Diff: android_webview/renderer/aw_content_settings_client.h

Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_ 5 #ifndef ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_
6 #define ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_ 6 #define ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_
7 7
8 #include "content/public/renderer/render_frame_observer.h" 8 #include "content/public/renderer/render_frame_observer.h"
9 #include "third_party/WebKit/public/web/WebContentSettingsClient.h" 9 #include "third_party/WebKit/public/web/WebContentSettingsClient.h"
10 10
11 namespace android_webview { 11 namespace android_webview {
12 12
13 // Android WebView implementation of blink::WebContentSettingsClient. 13 // Android WebView implementation of blink::WebContentSettingsClient.
14 class AwContentSettingsClient : public content::RenderFrameObserver, 14 class AwContentSettingsClient : public content::RenderFrameObserver,
15 public blink::WebContentSettingsClient { 15 public blink::WebContentSettingsClient {
16 public: 16 public:
17 explicit AwContentSettingsClient(content::RenderFrame* render_view); 17 explicit AwContentSettingsClient(content::RenderFrame* render_view);
18 18
19 private: 19 private:
20 ~AwContentSettingsClient() override; 20 ~AwContentSettingsClient() override;
21 21
22 // blink::WebContentSettingsClient implementation. 22 // blink::WebContentSettingsClient implementation.
23 bool allowDisplayingInsecureContent( 23 virtual bool allowDisplayingInsecureContent(
24 bool enabled_per_settings, 24 bool enabled_per_settings,
25 const blink::WebSecurityOrigin& origin, 25 const blink::WebSecurityOrigin& origin,
26 const blink::WebURL& url) override; 26 const blink::WebURL& url);
27 bool allowRunningInsecureContent( 27 virtual bool allowRunningInsecureContent(
28 bool enabled_per_settings, 28 bool enabled_per_settings,
29 const blink::WebSecurityOrigin& origin, 29 const blink::WebSecurityOrigin& origin,
30 const blink::WebURL& url) override; 30 const blink::WebURL& url);
31 31
32 DISALLOW_COPY_AND_ASSIGN(AwContentSettingsClient); 32 DISALLOW_COPY_AND_ASSIGN(AwContentSettingsClient);
33 }; 33 };
34 34
35 } // namespace android_webview 35 } // namespace android_webview
36 36
37 #endif // ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_ 37 #endif // ANDROID_WEBVIEW_RENDERER_AW_CONTENT_SETTINGS_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698