summaryrefslogtreecommitdiffstats
path: root/build/ios
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 03:22:29 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 03:22:29 +0000
commit45476987a3422a786cdb777f3f0bfc3ff4d87af8 (patch)
treec984a4025437b70cb2bfe257b9718ab73a4ca683 /build/ios
parent57c9eba18b5e69d71b7879d49c919fa6c2035753 (diff)
downloadchromium_src-45476987a3422a786cdb777f3f0bfc3ff4d87af8.zip
chromium_src-45476987a3422a786cdb777f3f0bfc3ff4d87af8.tar.gz
chromium_src-45476987a3422a786cdb777f3f0bfc3ff4d87af8.tar.bz2
Use production Wallet service URL by default.
Also change --wallet-service-use-prod to --wallet-service-use-sandbox instead (and update about:flags description). BUG=299902 R=estade@chromium.org TEST=unit_tests, no developer warning/real generated cards by default Review URL: https://codereview.chromium.org/25127002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/ios')
-rw-r--r--build/ios/grit_whitelist.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index 7948349..bcdb3f3 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -602,8 +602,6 @@ IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_DESCRIPTION
IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_NAME
IDS_FLAGS_ENABLE_VP9_PLAYBACK_DESCRIPTION
IDS_FLAGS_ENABLE_VP9_PLAYBACK_NAME
-IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_DESCRIPTION
-IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_NAME
IDS_FLAGS_ENABLE_WEBGL_DESCRIPTION
IDS_FLAGS_ENABLE_WEBGL_NAME
IDS_FLAGS_ENABLE_WEBP_IN_ACCEPT_HEADER_DESCRIPTION
@@ -723,6 +721,8 @@ IDS_FLAGS_USE_CLIENT_LOGIN_SIGNIN_FLOW_DESCRIPTION
IDS_FLAGS_USE_CLIENT_LOGIN_SIGNIN_FLOW_NAME
IDS_FLAGS_VIEWS_TEXTFIELD_DESCRIPTION
IDS_FLAGS_VIEWS_TEXTFIELD_NAME
+IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION
+IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME
IDS_FLAGS_WARNING_HEADER
IDS_FLAGS_WARNING_TEXT
IDS_FULLSCREEN