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

Side by Side 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 unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2014 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <resources> 6 <resources>
7 <!-- These must be kept in sync (and in-order) with components/dom_distiller/c ore/font_family_list.h --> 7 <!-- These must be kept in sync (and in-order) with components/dom_distiller/c ore/font_family_list.h -->
8 <string-array name="distiller_mode_font_family_values"> 8 <string-array name="distiller_mode_font_family_values">
9 <item>@string/sans_serif</item> 9 <item>@string/sans_serif</item>
10 <item>@string/serif</item> 10 <item>@string/serif</item>
11 <item>@string/monospace</item> 11 <item>@string/monospace</item>
12 </string-array> 12 </string-array>
13
14 <!-- Site settings -->
13 <string-array name="website_settings_permission_options"> 15 <string-array name="website_settings_permission_options">
14 <item>@string/website_settings_permissions_allow</item> 16 <item>@string/website_settings_permissions_allow</item>
15 <item>@string/website_settings_permissions_block</item> 17 <item>@string/website_settings_permissions_block</item>
16 </string-array> 18 </string-array>
19
20 <!-- Privacy preferences -->
21 <string-array name="bandwidth_entries">
22 <item>@string/always_prefetch_bandwidth_entry</item>
23 <item>@string/wifi_prefetch_bandwidth_entry</item>
24 <item>@string/never_prefetch_bandwidth_entry</item>
25 </string-array>
26 <string-array name="bandwidth_entry_values">
27 <item>@string/network_prediction_always_value</item>
28 <item>@string/network_prediction_wifi_only_value</item>
29 <item>@string/network_prediction_never_value</item>
30 </string-array>
31 <string-array name="crash_upload_entries">
32 <item>@string/crash_dump_always_upload</item>
33 <item>@string/crash_dump_only_with_wifi</item>
34 <item>@string/crash_dump_never_upload</item>
35 </string-array>
36 <string-array name="crash_upload_values">
37 <item>@string/crash_dump_always_upload_value</item>
38 <item>@string/crash_dump_only_with_wifi_value</item>
39 <item>@string/crash_dump_never_upload_value</item>
40 </string-array>
41
17 </resources> 42 </resources>
OLDNEW
« 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