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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/android/java/res/xml/site_settings_preferences.xml

Issue 2785913002: [subresource_filter] Add the Content Settings UI for Android (Closed)
Patch Set: git cl try Created 3 years, 8 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
« no previous file with comments | « chrome/android/java/res/xml/single_website_preferences.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java » ('j') | chrome/android/java/strings/android_chrome_strings.grd » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 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 <!-- The order of the following items is from: http://crbug.com/610358. --> 6 <!-- The order of the following items is from: http://crbug.com/610358. -->
7 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> 7 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
8 <!-- All sites --> 8 <!-- All sites -->
9 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference 9 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
10 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences" 10 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"
(...skipping 21 matching lines...) Expand all
32 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences" 32 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"
33 android:key="notifications" /> 33 android:key="notifications" />
34 <!-- JavaScript --> 34 <!-- JavaScript -->
35 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference 35 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
36 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences" 36 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"
37 android:key="javascript" /> 37 android:key="javascript" />
38 <!-- Popups --> 38 <!-- Popups -->
39 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference 39 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
40 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences" 40 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"
41 android:key="popups" /> 41 android:key="popups" />
42 <!-- SubresourceFilter -->
43 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
44 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"
45 android:key="subresource_filter" />
42 <!-- Background sync --> 46 <!-- Background sync -->
43 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference 47 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
44 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences" 48 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"
45 android:key="background_sync" /> 49 android:key="background_sync" />
46 <!-- Protected content --> 50 <!-- Protected content -->
47 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference 51 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
48 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences" 52 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"
49 android:key="protected_content" /> 53 android:key="protected_content" />
50 <!-- Autoplay --> 54 <!-- Autoplay -->
51 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference 55 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
(...skipping 18 matching lines...) Expand all
70 android:key="use_storage" 74 android:key="use_storage"
71 android:title="@string/website_settings_storage" 75 android:title="@string/website_settings_storage"
72 android:icon="@drawable/settings_storage" /> 76 android:icon="@drawable/settings_storage" />
73 <!-- USB --> 77 <!-- USB -->
74 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference 78 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
75 android:fragment="org.chromium.chrome.browser.preferences.website.UsbCho oserPreferences" 79 android:fragment="org.chromium.chrome.browser.preferences.website.UsbCho oserPreferences"
76 android:key="usb" 80 android:key="usb"
77 android:title="@string/website_settings_usb" 81 android:title="@string/website_settings_usb"
78 android:icon="@drawable/settings_usb" /> 82 android:icon="@drawable/settings_usb" />
79 </PreferenceScreen> 83 </PreferenceScreen>
OLDNEW
« no previous file with comments | « chrome/android/java/res/xml/single_website_preferences.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java » ('j') | chrome/android/java/strings/android_chrome_strings.grd » ('J')

Powered by Google App Engine
This is Rietveld 408576698