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

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

Issue 1084423002: Split Camera and Mic into two permissions on the Site Details page (under Site Settings). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Polish 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"
11 android:title="@string/all_sites" 11 android:title="@string/all_sites"
12 android:icon="@drawable/settings_all_sites" /> 12 android:icon="@drawable/settings_all_sites" />
13 <!-- Cookies --> 13 <!-- Cookies -->
14 <Preference 14 <Preference
15 android:key="cookies" 15 android:key="cookies"
16 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" /> 16 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" />
17 <!-- Location --> 17 <!-- Location -->
18 <Preference 18 <Preference
19 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 19 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
20 android:key="device_location" /> 20 android:key="device_location" />
21 <!-- Media --> 21 <!-- Camera -->
22 <Preference 22 <Preference
23 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 23 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
24 android:key="use_camera_or_mic" /> 24 android:key="camera" />
25 <!-- Microphone -->
26 <Preference
27 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
28 android:key="microphone" />
25 <!-- Notifications --> 29 <!-- Notifications -->
26 <Preference 30 <Preference
27 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 31 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
28 android:key="push_notifications" /> 32 android:key="push_notifications" />
29 <!-- Images --> 33 <!-- Images -->
30 <Preference 34 <Preference
31 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 35 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
32 android:key="images" /> 36 android:key="images" />
33 <!-- JavaScript --> 37 <!-- JavaScript -->
34 <Preference 38 <Preference
(...skipping 18 matching lines...) Expand all
53 android:title="@string/google_translate" 57 android:title="@string/google_translate"
54 android:icon="@drawable/settings_translate" /> 58 android:icon="@drawable/settings_translate" />
55 <!-- Storage --> 59 <!-- Storage -->
56 <!-- 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. - ->
57 <Preference 61 <Preference
58 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 62 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
59 android:key="use_storage" 63 android:key="use_storage"
60 android:title="@string/website_settings_storage" 64 android:title="@string/website_settings_storage"
61 android:icon="@drawable/settings_storage" /> 65 android:icon="@drawable/settings_storage" />
62 </PreferenceScreen> 66 </PreferenceScreen>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698