chrome/browser/content_settings/tab_specific_content_settings.h - Issue 2377603002: Disable ServiceWorker when JS is disabled

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings.h

Issue 2377603002: Disable ServiceWorker when JS is disabled (Closed)

Patch Set: wrap by FILE_PATH_LITERAL Created 4 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:

Index: chrome/browser/content_settings/tab_specific_content_settings.h

diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h

index 9c07aa00ea61eebddf304e54eb54e09aad54671a..dadc0a8c2c3f829ebba3d69415f49db8742b1fe0 100644

--- a/chrome/browser/content_settings/tab_specific_content_settings.h

+++ b/chrome/browser/content_settings/tab_specific_content_settings.h

@@ -168,16 +168,17 @@ class TabSpecificContentSettings

static void ServiceWorkerAccessed(int render_process_id,

int render_frame_id,

const GURL& scope,

- bool blocked_by_policy);

+ bool blocked_by_policy_javascript,

+ bool blocked_by_policy_cookie);

// Resets the |content_blocked_| and |content_allowed_| arrays, except for

// CONTENT_SETTINGS_TYPE_COOKIES related information.

falken 2016/10/05 01:16:50 This comment is no longer true. Now it's COOKIES a

shimazu 2016/10/05 02:10:57 Done.

// TODO(vabr): Only public for tests. Move to a test client.

- void ClearBlockedContentSettingsExceptForCookies();

+ void ClearBlockedContentSettingsExceptForNavigationRelatedSettings();

// Resets all cookies related information.

falken 2016/10/05 01:16:50 ditto

shimazu 2016/10/05 02:10:57 Done.

// TODO(vabr): Only public for tests. Move to a test client.

- void ClearCookieSpecificContentSettings();

+ void ClearNavigationRelatedContentSettings();

// Changes the |content_blocked_| entry for popups.

void SetPopupsBlocked(bool blocked);

@@ -351,7 +352,9 @@ class TabSpecificContentSettings

void OnLocalStorageAccessed(const GURL& url,

bool local,

bool blocked_by_policy);

- void OnServiceWorkerAccessed(const GURL& scope, bool blocked_by_policy);

+ void OnServiceWorkerAccessed(const GURL& scope,

+ bool blocked_by_policy_javascript,

+ bool blocked_by_policy_cookie);

void OnWebDatabaseAccessed(const GURL& url,

const base::string16& name,

const base::string16& display_name,