| Index: chrome/android/java/res/xml/site_settings_preferences.xml
|
| diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
|
| index 96d9142ca496820295c39ccfcdad3391823f540b..a8f177fce7c235b44a954bdcb7d188cfa8739045 100644
|
| --- a/chrome/android/java/res/xml/site_settings_preferences.xml
|
| +++ b/chrome/android/java/res/xml/site_settings_preferences.xml
|
| @@ -3,8 +3,7 @@
|
| Use of this source code is governed by a BSD-style license that can be
|
| found in the LICENSE file. -->
|
|
|
| -<!-- The list below All Sites is ordered by privacy-sensitive items first. If
|
| - you are not sure where to add your item, add it above Storage. -->
|
| +<!-- The order of the following items is from: http://crbug.com/610358. -->
|
| <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
| <!-- All sites -->
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| @@ -28,6 +27,10 @@
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| android:key="microphone" />
|
| + <!-- Notifications -->
|
| + <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| + android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| + android:key="notifications" />
|
| <!-- JavaScript -->
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| @@ -36,26 +39,22 @@
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| android:key="popups" />
|
| - <!-- Fullscreen -->
|
| - <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| - android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| - android:key="fullscreen" />
|
| - <!-- Notifications -->
|
| + <!-- Background sync -->
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| - android:key="notifications" />
|
| - <!-- Autoplay -->
|
| + android:key="background_sync" />
|
| + <!-- Fullscreen -->
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| - android:key="autoplay" />
|
| + android:key="fullscreen" />
|
| <!-- Protected content -->
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| android:key="protected_content" />
|
| - <!-- Background sync -->
|
| + <!-- Autoplay -->
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
|
| - android:key="background_sync" />
|
| + android:key="autoplay" />
|
| <!-- Language -->
|
| <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
|
| android:fragment="org.chromium.chrome.browser.preferences.website.LanguagePreferences"
|
|
|