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

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

Issue 1091253005: [Android] Update Protected Media Identifier Settings UI to reflect exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> 6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
7 <!-- All sites --> 7 <!-- All sites -->
8 <Preference 8 <Preference
9 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 9 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
10 android:key="website_settings" 10 android:key="website_settings"
(...skipping 26 matching lines...) Expand all
37 <!-- Popups --> 37 <!-- Popups -->
38 <Preference 38 <Preference
39 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 39 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
40 android:key="popups" /> 40 android:key="popups" />
41 <!-- Fullscreen --> 41 <!-- Fullscreen -->
42 <Preference 42 <Preference
43 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 43 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
44 android:key="fullscreen" /> 44 android:key="fullscreen" />
45 <!-- Protected content --> 45 <!-- Protected content -->
46 <Preference 46 <Preference
47 android:fragment="org.chromium.chrome.browser.preferences.ProtectedConte ntPreferences" 47 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
48 android:key="protected_content" /> 48 android:key="protected_content" />
49 <!-- Google Translate --> 49 <!-- Google Translate -->
50 <Preference 50 <Preference
51 android:fragment="org.chromium.chrome.browser.preferences.website.Transl atePreferences" 51 android:fragment="org.chromium.chrome.browser.preferences.website.Transl atePreferences"
52 android:key="translate" 52 android:key="translate"
53 android:title="@string/google_translate" 53 android:title="@string/google_translate"
54 android:icon="@drawable/settings_translate" /> 54 android:icon="@drawable/settings_translate" />
55 <!-- Storage --> 55 <!-- Storage -->
56 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - -> 56 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - ->
57 <Preference 57 <Preference
58 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 58 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
59 android:key="use_storage" 59 android:key="use_storage"
60 android:title="@string/website_settings_storage" 60 android:title="@string/website_settings_storage"
61 android:icon="@drawable/settings_storage" /> 61 android:icon="@drawable/settings_storage" />
62 </PreferenceScreen> 62 </PreferenceScreen>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698