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

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

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: rebased 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
« no previous file with comments | « no previous file | chrome/browser/android/preferences/website_preference_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..8da39d506d8ab02ffa3bf58ab0a42ad779d6efdf 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -193,7 +193,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));
+ entries[i].GetContentSetting(),
+ ConvertUTF8ToJavaString(env, entries[i].source));
}
}
« no previous file with comments | « no previous file | chrome/browser/android/preferences/website_preference_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698