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

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: Missed a change in prev patch Created 5 years, 7 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 | « no previous file | chrome/android/java/res/xml/protected_content_preferences.xml » ('j') | no next file with comments »
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 <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 30 matching lines...) Expand all
41 <!-- Popups --> 41 <!-- Popups -->
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="popups" /> 44 android:key="popups" />
45 <!-- Fullscreen --> 45 <!-- Fullscreen -->
46 <Preference 46 <Preference
47 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 47 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
48 android:key="fullscreen" /> 48 android:key="fullscreen" />
49 <!-- Protected content --> 49 <!-- Protected content -->
50 <Preference 50 <Preference
51 android:fragment="org.chromium.chrome.browser.preferences.ProtectedConte ntPreferences" 51 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
52 android:key="protected_content" /> 52 android:key="protected_content" />
53 <!-- Google Translate --> 53 <!-- Google Translate -->
54 <Preference 54 <Preference
55 android:fragment="org.chromium.chrome.browser.preferences.website.Transl atePreferences" 55 android:fragment="org.chromium.chrome.browser.preferences.website.Transl atePreferences"
56 android:key="translate" 56 android:key="translate"
57 android:title="@string/google_translate" 57 android:title="@string/google_translate"
58 android:icon="@drawable/settings_translate" /> 58 android:icon="@drawable/settings_translate" />
59 <!-- Storage --> 59 <!-- Storage -->
60 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - -> 60 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - ->
61 <Preference 61 <Preference
62 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 62 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
63 android:key="use_storage" 63 android:key="use_storage"
64 android:title="@string/website_settings_storage" 64 android:title="@string/website_settings_storage"
65 android:icon="@drawable/settings_storage" /> 65 android:icon="@drawable/settings_storage" />
66 </PreferenceScreen> 66 </PreferenceScreen>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/xml/protected_content_preferences.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698