diff options
| author | rsesek <rsesek@chromium.org> | 2014-11-05 17:14:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-06 01:15:44 +0000 |
| commit | ca65db9dda0081552a20a5765a7f058f46d4548e (patch) | |
| tree | 37bd93750a1a18e0dd5b5d7c750f9687aab1ba3c /chrome/browser/android/preferences | |
| parent | b06d8355263e11c3f755f732d9283b7b05c614d5 (diff) | |
| download | chromium_src-ca65db9dda0081552a20a5765a7f058f46d4548e.zip chromium_src-ca65db9dda0081552a20a5765a7f058f46d4548e.tar.gz chromium_src-ca65db9dda0081552a20a5765a7f058f46d4548e.tar.bz2 | |
[Android] Plumb the block third-party cookies setting.
This also removes nativeGetAllowCookiesEnabled(), which is dead code since
nativeGetAcceptCookiesEnabled() is used instead.
BUG=149400
Review URL: https://codereview.chromium.org/701163004
Cr-Commit-Position: refs/heads/master@{#302935}
Diffstat (limited to 'chrome/browser/android/preferences')
| -rw-r--r-- | chrome/browser/android/preferences/pref_service_bridge.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc index fdb9512..eb8c975 100644 --- a/chrome/browser/android/preferences/pref_service_bridge.cc +++ b/chrome/browser/android/preferences/pref_service_bridge.cc @@ -192,6 +192,14 @@ static jboolean GetAcceptCookiesManaged(JNIEnv* env, jobject obj) { CONTENT_SETTINGS_TYPE_COOKIES); } +static jboolean GetBlockThirdPartyCookiesEnabled(JNIEnv* env, jobject obj) { + return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies); +} + +static jboolean GetBlockThirdPartyCookiesManaged(JNIEnv* env, jobject obj) { + return GetPrefService()->IsManagedPreference(prefs::kBlockThirdPartyCookies); +} + static jboolean GetRememberPasswordsEnabled(JNIEnv* env, jobject obj) { return GetPrefService()->GetBoolean( password_manager::prefs::kPasswordManagerSavingEnabled); @@ -358,13 +366,6 @@ static void ClearBrowsingData(JNIEnv* env, jobject obj, jboolean history, BrowsingDataHelper::UNPROTECTED_WEB); } -static jboolean GetAllowCookiesEnabled(JNIEnv* env, jobject obj) { - HostContentSettingsMap* content_settings = - GetOriginalProfile()->GetHostContentSettingsMap(); - return GetBooleanForContentSetting( - content_settings, CONTENT_SETTINGS_TYPE_COOKIES); -} - static void SetAllowCookiesEnabled(JNIEnv* env, jobject obj, jboolean allow) { HostContentSettingsMap* host_content_settings_map = GetOriginalProfile()->GetHostContentSettingsMap(); @@ -373,6 +374,11 @@ static void SetAllowCookiesEnabled(JNIEnv* env, jobject obj, jboolean allow) { allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK); } +static void SetBlockThirdPartyCookiesEnabled(JNIEnv* env, jobject obj, + jboolean enabled) { + GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled); +} + static void SetRememberPasswordsEnabled(JNIEnv* env, jobject obj, jboolean allow) { GetPrefService()->SetBoolean( |