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

Unified 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/res/values/arrays.xml
diff --git a/chrome/android/java/res/values/arrays.xml b/chrome/android/java/res/values/arrays.xml
index d8266f3daf15c65f4a6fe3810807b69503be16c7..5e86ef22bd8f7314a7380117c540bd6c53a6e165 100644
--- a/chrome/android/java/res/values/arrays.xml
+++ b/chrome/android/java/res/values/arrays.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
- found in the LICENSE file.
--->
+ found in the LICENSE file. -->
+
<resources>
<!-- These must be kept in sync (and in-order) with components/dom_distiller/core/font_family_list.h -->
<string-array name="distiller_mode_font_family_values">
@@ -10,4 +10,8 @@
<item>@string/serif</item>
<item>@string/monospace</item>
</string-array>
+ <string-array name="website_settings_permission_options">
+ <item>@string/website_settings_permissions_allow</item>
+ <item>@string/website_settings_permissions_block</item>
+ </string-array>
</resources>
« no previous file with comments | « chrome/android/java/res/menu/website_preferences_menu.xml ('k') | chrome/android/java/res/values/colors.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698