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

Unified Diff: chrome/android/java/res/values/arrays.xml

Issue 935903002: Upstream privacy settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: init CommandLine to fix tests Created 5 years, 10 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 | « chrome/android/java/res/values-v17/styles.xml ('k') | chrome/android/java/res/values/values.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/res/values/arrays.xml
diff --git a/chrome/android/java/res/values/arrays.xml b/chrome/android/java/res/values/arrays.xml
index 5e86ef22bd8f7314a7380117c540bd6c53a6e165..8a35a660ad17738ce5928d303a18ee9c6336ac68 100644
--- a/chrome/android/java/res/values/arrays.xml
+++ b/chrome/android/java/res/values/arrays.xml
@@ -10,8 +10,33 @@
<item>@string/serif</item>
<item>@string/monospace</item>
</string-array>
+
+ <!-- Site settings -->
<string-array name="website_settings_permission_options">
<item>@string/website_settings_permissions_allow</item>
<item>@string/website_settings_permissions_block</item>
</string-array>
+
+ <!-- Privacy preferences -->
+ <string-array name="bandwidth_entries">
+ <item>@string/always_prefetch_bandwidth_entry</item>
+ <item>@string/wifi_prefetch_bandwidth_entry</item>
+ <item>@string/never_prefetch_bandwidth_entry</item>
+ </string-array>
+ <string-array name="bandwidth_entry_values">
+ <item>@string/network_prediction_always_value</item>
+ <item>@string/network_prediction_wifi_only_value</item>
+ <item>@string/network_prediction_never_value</item>
+ </string-array>
+ <string-array name="crash_upload_entries">
+ <item>@string/crash_dump_always_upload</item>
+ <item>@string/crash_dump_only_with_wifi</item>
+ <item>@string/crash_dump_never_upload</item>
+ </string-array>
+ <string-array name="crash_upload_values">
+ <item>@string/crash_dump_always_upload_value</item>
+ <item>@string/crash_dump_only_with_wifi_value</item>
+ <item>@string/crash_dump_never_upload_value</item>
+ </string-array>
+
</resources>
« no previous file with comments | « chrome/android/java/res/values-v17/styles.xml ('k') | chrome/android/java/res/values/values.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698