chrome/android/java/res/xml/single_website_preferences.xml - Issue 1432573002: Adding <keygen> Content Setting (Android UI)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui

Patch Set: Trying tested code. Created 4 years, 11 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/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java » ('j') | no next file with comments »

OLD	NEW
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 <org.chromium.chrome.browser.preferences.ChromeBasePreference	7 <org.chromium.chrome.browser.preferences.ChromeBasePreference

8 android:key="os_permissions_warning" />	8 android:key="os_permissions_warning" />

9 <org.chromium.chrome.browser.preferences.ChromeBasePreference	9 <org.chromium.chrome.browser.preferences.ChromeBasePreference

10 android:key="os_permissions_warning_extra" />	10 android:key="os_permissions_warning_extra" />

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	42 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

43 android:key="popup_permission_list" />	43 android:key="popup_permission_list" />

44 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	44 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

45 android:key="fullscreen_permission_list" />	45 android:key="fullscreen_permission_list" />

46 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	46 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

47 android:key="midi_sysex_permission_list" />	47 android:key="midi_sysex_permission_list" />

48 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	48 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

49 android:key="push_notifications_list" />	49 android:key="push_notifications_list" />

50 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	50 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

51 android:key="protected_media_identifier_permission_list" />	51 android:key="protected_media_identifier_permission_list" />

	52 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

	53 android:key="keygen_permission_list" />

52 <org.chromium.chrome.browser.preferences.ButtonPreference	54 <org.chromium.chrome.browser.preferences.ButtonPreference

53 android:key="reset_site_button"	55 android:key="reset_site_button"

54 android:title="@string/website_reset" />	56 android:title="@string/website_reset" />

55 </PreferenceScreen>	57 </PreferenceScreen>

OLD	NEW