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

Unified Diff: chrome/browser/android/preferences/website_preference_bridge.cc

Issue 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui
Patch Set: Trying tested code. Created 4 years, 11 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: chrome/browser/android/preferences/website_preference_bridge.cc
diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc
index fecc1583bf232d792286f94a77c396628f9d943a..4e785c7b61f9fbac70d7505ed242e536aaa1a7e1 100644
--- a/chrome/browser/android/preferences/website_preference_bridge.cc
+++ b/chrome/browser/android/preferences/website_preference_bridge.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/browsing_data/local_data_container.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/content_settings/web_site_settings_uma_util.h"
#include "chrome/browser/notifications/desktop_notification_profile_util.h"
#include "chrome/browser/profiles/profile.h"
@@ -205,6 +206,44 @@ static void SetGeolocationSettingForOrigin(
(ContentSetting) value, is_incognito);
}
+static void GetKeygenOrigins(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ const JavaParamRef<jobject>& list) {
+ GetOrigins(env, CONTENT_SETTINGS_TYPE_KEYGEN,
+ &Java_WebsitePreferenceBridge_insertKeygenInfoIntoList, list,
+ false);
+}
+
+static jint GetKeygenSettingForOrigin(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ const JavaParamRef<jstring>& origin,
+ const JavaParamRef<jstring>& embedder,
+ jboolean is_incognito) {
+ return GetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_KEYGEN, origin,
+ embedder, is_incognito);
+}
+
+static void SetKeygenSettingForOrigin(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ const JavaParamRef<jstring>& origin,
+ const JavaParamRef<jstring>& embedder,
+ jint value,
+ jboolean is_incognito) {
+ GURL embedder_url(ConvertJavaStringToUTF8(env, embedder));
+ SetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_KEYGEN, origin,
+ ContentSettingsPattern::FromURLNoWildcard(embedder_url),
+ (ContentSetting) value, is_incognito);
+}
+
+static jboolean GetKeygenBlocked(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ const JavaParamRef<jobject>& java_web_contents) {
+ content::WebContents* web_contents =
+ content::WebContents::FromJavaWebContents(java_web_contents);
+ return TabSpecificContentSettings::FromWebContents(
+ web_contents)->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN);
+}
+
static void GetMidiOrigins(JNIEnv* env,
const JavaParamRef<jclass>& clazz,
const JavaParamRef<jobject>& list) {

Powered by Google App Engine
This is Rietveld 408576698