Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index 45de8fe4fba9f5e300237bbde24f7d6cc4fc9e83..ab5c579b4321b7f2fb1ba4af9180ffd7d41a6f3d 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -1909,11 +1909,17 @@ const FeatureEntry kFeatureEntries[] = { |
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, |
switches::kDisableVrShell)}, |
#endif |
- |
{"enable-weak-memorycache", |
IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_NAME, |
IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_DESCRIPTION, kOsAll, |
FEATURE_VALUE_TYPE(features::kWeakMemoryCache)}, |
+#if defined(OS_ANDROID) |
+ {"enable-android-pay-integration-v1", |
gone
2016/06/16 17:52:44
Any objection to moving this into the other OS_AND
please use gerrit instead
2016/06/16 18:09:02
Done.
|
+ IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, |
+ IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, |
+ FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, |
+#endif |
+ |
// NOTE: Adding new command-line switches requires adding corresponding |
// entries to enum "LoginCustomFlags" in histograms.xml. See note in |
// histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |