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

Side by Side Diff: chrome/android/java/res/xml/single_website_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 <PreferenceCategory 7 <PreferenceCategory
8 android:key="site_heading" 8 android:key="site_heading"
9 android:title="@string/website_settings_site_category" /> 9 android:title="@string/website_settings_site_category" />
10 <org.chromium.chrome.browser.preferences.TextMessagePreference 10 <org.chromium.chrome.browser.preferences.TextMessagePreference
11 android:key="site_title" /> 11 android:key="site_title" />
12 <PreferenceCategory 12 <PreferenceCategory
13 android:key="site_usage" 13 android:key="site_usage"
14 android:title="@string/website_settings_usage_category" /> 14 android:title="@string/website_settings_usage_category" />
15 <org.chromium.chrome.browser.preferences.website.ClearWebsiteStorage 15 <org.chromium.chrome.browser.preferences.website.ClearWebsiteStorage
16 android:key="clear_data" 16 android:key="clear_data"
17 android:title="@string/webstorage_clear_data_dialog_title" 17 android:title="@string/webstorage_clear_data_dialog_title"
18 android:dialogMessage="@string/webstorage_clear_data_dialog_message" 18 android:dialogMessage="@string/webstorage_clear_data_dialog_message"
19 android:positiveButtonText="@string/webstorage_clear_data_dialog_ok_butt on" 19 android:positiveButtonText="@string/webstorage_clear_data_dialog_ok_butt on"
20 android:negativeButtonText="@string/cancel" 20 android:negativeButtonText="@string/cancel"
21 android:widgetLayout="@layout/clear_storage" /> 21 android:widgetLayout="@layout/clear_storage" />
22 <PreferenceCategory 22 <PreferenceCategory
23 android:key="site_permissions" 23 android:key="site_permissions"
24 android:title="@string/website_settings_permissions_category" /> 24 android:title="@string/website_settings_permissions_category" />
25 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 25 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
26 android:key="cookies_permission_list" /> 26 android:key="cookies_permission_list" />
27 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 27 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
28 android:key="voice_and_video_capture_permission_list" /> 28 android:key="video_capture_permission_list" />
newt (away) 2015/04/22 17:35:54 "camera_permission_list", similarly below
Finnur 2015/04/24 13:51:59 Done.
29 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
30 android:key="voice_capture_permission_list" />
29 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 31 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
30 android:key="popup_permission_list" /> 32 android:key="popup_permission_list" />
31 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 33 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
32 android:key="images_permission_list" /> 34 android:key="images_permission_list" />
33 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 35 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
34 android:key="javascript_permission_list" /> 36 android:key="javascript_permission_list" />
35 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 37 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
36 android:key="location_access_list" /> 38 android:key="location_access_list" />
37 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 39 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
38 android:key="push_notifications_list" /> 40 android:key="push_notifications_list" />
39 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 41 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
40 android:key="midi_sysex_permission_list" /> 42 android:key="midi_sysex_permission_list" />
41 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 43 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
42 android:key="protected_media_identifier_permission_list" /> 44 android:key="protected_media_identifier_permission_list" />
43 <org.chromium.chrome.browser.preferences.ButtonPreference 45 <org.chromium.chrome.browser.preferences.ButtonPreference
44 android:key="reset_site_button" 46 android:key="reset_site_button"
45 android:title="@string/website_reset" /> 47 android:title="@string/website_reset" />
46 </PreferenceScreen> 48 </PreferenceScreen>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698