| Index: chrome/android/java/res/xml/single_website_preferences.xml
|
| diff --git a/chrome/android/java/res/xml/single_website_preferences.xml b/chrome/android/java/res/xml/single_website_preferences.xml
|
| index 0d171442f2f2cdf6ca0a7ef0f11c181deca750fe..188fbddf8f04386684996ddac7ee782b580923a4 100644
|
| --- a/chrome/android/java/res/xml/single_website_preferences.xml
|
| +++ b/chrome/android/java/res/xml/single_website_preferences.xml
|
| @@ -3,7 +3,9 @@
|
| Use of this source code is governed by a BSD-style license that can be
|
| found in the LICENSE file. -->
|
|
|
| -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
| +<PreferenceScreen
|
| + xmlns:android="http://schemas.android.com/apk/res/android"
|
| + xmlns:chrome="http://schemas.android.com/apk/res-auto">
|
| <org.chromium.chrome.browser.preferences.ChromeBasePreference
|
| android:key="os_permissions_warning" />
|
| <org.chromium.chrome.browser.preferences.ChromeBasePreference
|
| @@ -45,8 +47,12 @@
|
| android:key="javascript_permission_list" />
|
| <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
|
| android:key="popup_permission_list" />
|
| - <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
|
| - android:key="subresource_filter_permission_list" />
|
| + <org.chromium.chrome.browser.preferences.website.SubresourceFilterListPreference
|
| + android:key="subresource_filter_permission_list"
|
| + chrome:passiveAllowText="@string/website_settings_permissions_allow"
|
| + chrome:activeAllowText="@string/subresource_filter_permission_allow_active"
|
| + chrome:passiveBlockText="@string/subresource_filter_permission_block_passive"
|
| + chrome:activeBlockText="@string/subresource_filter_permission_block_active" />
|
| <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
|
| android:key="background_sync_permission_list" />
|
| <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
|
|
|