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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2715013002: [Payments] Put Web Payments feature on desktop behind flag (Closed)
Patch Set: untouch runtime_features file Created 3 years, 9 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 2031 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 {"enable-loading-ipc-optimization-for-small-resources", 2042 {"enable-loading-ipc-optimization-for-small-resources",
2043 IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_NAME, 2043 IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_NAME,
2044 IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_DESCRIPTION, kOsAll, 2044 IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_DESCRIPTION, kOsAll,
2045 FEATURE_VALUE_TYPE(features::kOptimizeLoadingIPCForSmallResources)}, 2045 FEATURE_VALUE_TYPE(features::kOptimizeLoadingIPCForSmallResources)},
2046 {"enable-font-cache-scaling", IDS_FLAGS_FONT_CACHE_SCALING_NAME, 2046 {"enable-font-cache-scaling", IDS_FLAGS_FONT_CACHE_SCALING_NAME,
2047 IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll, 2047 IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll,
2048 FEATURE_VALUE_TYPE(features::kFontCacheScaling)}, 2048 FEATURE_VALUE_TYPE(features::kFontCacheScaling)},
2049 {"enable-framebusting-needs-sameorigin-or-usergesture", 2049 {"enable-framebusting-needs-sameorigin-or-usergesture",
2050 IDS_FLAGS_FRAMEBUSTING_NAME, IDS_FLAGS_FRAMEBUSTING_DESCRIPTION, kOsAll, 2050 IDS_FLAGS_FRAMEBUSTING_NAME, IDS_FLAGS_FRAMEBUSTING_DESCRIPTION, kOsAll,
2051 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, 2051 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)},
2052 {"web-payments", IDS_FLAGS_WEB_PAYMENTS_NAME,
2053 IDS_FLAGS_WEB_PAYMENTS_DESCRIPTION, kOsDesktop,
2054 FEATURE_VALUE_TYPE(features::kWebPayments)},
2052 #if defined(OS_ANDROID) 2055 #if defined(OS_ANDROID)
2053 {"enable-android-pay-integration-v1", 2056 {"enable-android-pay-integration-v1",
2054 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, 2057 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME,
2055 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, 2058 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid,
2056 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, 2059 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)},
2057 {"enable-android-pay-integration-v2", 2060 {"enable-android-pay-integration-v2",
2058 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_NAME, 2061 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_NAME,
2059 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_DESCRIPTION, kOsAndroid, 2062 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_DESCRIPTION, kOsAndroid,
2060 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV2)}, 2063 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV2)},
2061 {"enable-web-payments-single-app-ui-skip", 2064 {"enable-web-payments-single-app-ui-skip",
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
2517 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2520 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2518 2521
2519 const FeatureEntry* GetFeatureEntries(size_t* count) { 2522 const FeatureEntry* GetFeatureEntries(size_t* count) {
2520 *count = arraysize(kFeatureEntries); 2523 *count = arraysize(kFeatureEntries);
2521 return kFeatureEntries; 2524 return kFeatureEntries;
2522 } 2525 }
2523 2526
2524 } // namespace testing 2527 } // namespace testing
2525 2528
2526 } // namespace about_flags 2529 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698