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

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

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: ps Created 3 years, 6 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/pref_service_bridge.cc
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index f4e3fd23d995913a00fdb9759b9600b2f9128120..ce9fcfe2b1ea4028eb60d9c0c1ca05173e407421 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -38,6 +38,7 @@
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
+#include "components/content_settings/core/common/content_settings_utils.h"
#include "components/content_settings/core/common/pref_names.h"
#include "components/metrics/metrics_pref_names.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
@@ -193,7 +194,8 @@ static void GetContentSettingsExceptions(JNIEnv* env,
Java_PrefServiceBridge_addContentSettingExceptionToList(
env, list, content_settings_type,
ConvertUTF8ToJavaString(env, entries[i].primary_pattern.ToString()),
- entries[i].setting, ConvertUTF8ToJavaString(env, entries[i].source));
+ content_settings::ValueToContentSetting(entries[i].setting_value.get()),
+ ConvertUTF8ToJavaString(env, entries[i].source));
}
}

Powered by Google App Engine
This is Rietveld 408576698