chrome/android/java/res/values/arrays.xml - Issue 850813002: Upstream Site 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/values/arrays.xml

Issue 850813002: Upstream Site Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@location_settings_singleton

Patch Set: use findbugs annotations; fix test Created 5 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:

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 2014 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 <resources>	6 <resources>

7 <!-- These must be kept in sync (and in-order) with components/dom_distiller/c ore/font_family_list.h -->	7 <!-- These must be kept in sync (and in-order) with components/dom_distiller/c ore/font_family_list.h -->

8 <string-array name="distiller_mode_font_family_values">	8 <string-array name="distiller_mode_font_family_values">

9 <item>@string/sans_serif</item>	9 <item>@string/sans_serif</item>

10 <item>@string/serif</item>	10 <item>@string/serif</item>

11 <item>@string/monospace</item>	11 <item>@string/monospace</item>

12 </string-array>	12 </string-array>

	13 <string-array name="website_settings_permission_options">

	14 <item>@string/website_settings_permissions_allow</item>

	15 <item>@string/website_settings_permissions_block</item>

	16 </string-array>

13 </resources>	17 </resources>

OLD	NEW