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

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrameClient.h

Issue 2786673002: Separate ContentSettingsClient out from LocalFrameClient (Closed)
Patch Set: added class-level comment Created 3 years, 8 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
Index: third_party/WebKit/Source/core/frame/LocalFrameClient.h
diff --git a/third_party/WebKit/Source/core/frame/LocalFrameClient.h b/third_party/WebKit/Source/core/frame/LocalFrameClient.h
index dc4f0bf1150dd3863a3158698a2c898a72d80f3a..04066845b3f9b5118e46d6b8dce81a3eff7b033e 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrameClient.h
+++ b/third_party/WebKit/Source/core/frame/LocalFrameClient.h
@@ -234,39 +234,6 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
virtual void didChangeScrollOffset() {}
virtual void didUpdateCurrentHistoryItem() {}
- virtual bool allowScript(bool enabledPerSettings) {
- return enabledPerSettings;
- }
- virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL&) {
- return enabledPerSettings;
- }
- virtual bool allowPlugins(bool enabledPerSettings) {
- return enabledPerSettings;
- }
- virtual bool allowImage(bool enabledPerSettings, const KURL&) {
- return enabledPerSettings;
- }
- virtual bool allowRunningInsecureContent(bool enabledPerSettings,
- SecurityOrigin*,
- const KURL&) {
- return enabledPerSettings;
- }
- virtual bool allowAutoplay(bool defaultValue) { return defaultValue; }
-
- // Reports that passive mixed content was found at the provided URL. It may or
- // may not be actually displayed later, what would be flagged by
- // didDisplayInsecureContent.
- virtual void passiveInsecureContentFound(const KURL&) {}
-
- // This callback notifies the client that the frame was about to run
- // JavaScript but did not because allowScript returned false. We have a
- // separate callback here because there are a number of places that need to
- // know if JavaScript is enabled but are not necessarily preparing to execute
- // script.
- virtual void didNotAllowScript() {}
- // This callback is similar, but for plugins.
- virtual void didNotAllowPlugins() {}
-
virtual WebCookieJar* cookieJar() const = 0;
virtual void didChangeName(const String&) {}
@@ -303,6 +270,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
virtual std::unique_ptr<WebServiceWorkerProvider>
createServiceWorkerProvider() = 0;
+ virtual ContentSettingsClient& contentSettingsClient() = 0;
+
virtual SharedWorkerRepositoryClient* sharedWorkerRepositoryClient() {
return 0;
}
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.cpp ('k') | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698