chrome/android/java/res/xml/do_not_track_preferences.xml - Issue 935903002: Upstream privacy settings.

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/do_not_track_preferences.xml

Issue 935903002: Upstream privacy settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: init CommandLine to fix tests Created 5 years, 10 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

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- Copyright 2014 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	6 <PreferenceScreen

7 xmlns:android="http://schemas.android.com/apk/res/android"	7 xmlns:android="http://schemas.android.com/apk/res/android"

8 xmlns:chrome="http://schemas.android.com/apk/res-auto">	8 xmlns:chrome="http://schemas.android.com/apk/res-auto">

9	9

10 <org.chromium.chrome.browser.preferences.ChromeSwitchPreference	10 <org.chromium.chrome.browser.preferences.ChromeSwitchPreference

11 android:key="protected_content_switch"	11 android:key="do_not_track_switch"

12 android:summaryOn="@string/text_on"	12 android:summaryOn="@string/text_on"

13 android:summaryOff="@string/text_off" />	13 android:summaryOff="@string/text_off" />

14	14

15 <org.chromium.chrome.browser.preferences.TextMessagePreference	15 <org.chromium.chrome.browser.preferences.TextMessagePreference

16 android:title="@string/protected_content_prefs_description" />	16 android:title="@string/do_not_track_description" />

17	17

18 <org.chromium.chrome.browser.preferences.HyperlinkPreference	18 <org.chromium.chrome.browser.preferences.HyperlinkPreference

19 android:key="protected_content_learn_more"	19 android:key="do_not_track_learn_more"

20 android:title="@string/learn_more"	20 android:title="@string/learn_more"

21 chrome:url="@string/protected_content_learn_more_url"	21 chrome:url="@string/do_not_track_learn_more_url"

22 chrome:imitateWebLink="true" />	22 chrome:imitateWebLink="true" />

23	23

24 <org.chromium.chrome.browser.preferences.ButtonPreference

25 android:key="reset_device_credentials_button"

26 android:title="@string/reset_device_credentials" />

27

28 </PreferenceScreen>	24 </PreferenceScreen>

OLD	NEW