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

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

Issue 2145793002: Enable PaymentRequest on Android by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 5 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
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 1936 matching lines...) Expand 10 before | Expand all | Expand 10 after
1947 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)}, 1947 FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)},
1948 #if defined(OS_CHROMEOS) 1948 #if defined(OS_CHROMEOS)
1949 {"enable-intent-picker", IDS_ENABLE_INTENT_PICKER, 1949 {"enable-intent-picker", IDS_ENABLE_INTENT_PICKER,
1950 IDS_ENABLE_INTENT_PICKER_DESCRIPTION, kOsCrOS, 1950 IDS_ENABLE_INTENT_PICKER_DESCRIPTION, kOsCrOS,
1951 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)}, 1951 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)},
1952 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, 1952 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME,
1953 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, 1953 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS,
1954 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, 1954 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView,
1955 chromeos::switches::kDisableFilesQuickView)}, 1955 chromeos::switches::kDisableFilesQuickView)},
1956 #endif // defined(OS_CHROMEOS) 1956 #endif // defined(OS_CHROMEOS)
1957 #if defined(OS_ANDROID)
1958 {"enable-payment-request", IDS_FLAGS_ENABLE_PAYMENT_REQUEST_NAME,
1959 IDS_FLAGS_ENABLE_PAYMENT_REQUEST_DESCRIPTION, kOsAndroid,
1960 FEATURE_VALUE_TYPE(features::kPaymentRequest)},
1961 #endif // defined(OS_ANDROID)
1957 // NOTE: Adding new command-line switches requires adding corresponding 1962 // NOTE: Adding new command-line switches requires adding corresponding
1958 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1963 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1959 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1964 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1960 }; 1965 };
1961 1966
1962 class FlagsStateSingleton { 1967 class FlagsStateSingleton {
1963 public: 1968 public:
1964 FlagsStateSingleton() 1969 FlagsStateSingleton()
1965 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 1970 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1966 ~FlagsStateSingleton() {} 1971 ~FlagsStateSingleton() {}
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
2137 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2142 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2138 2143
2139 const FeatureEntry* GetFeatureEntries(size_t* count) { 2144 const FeatureEntry* GetFeatureEntries(size_t* count) {
2140 *count = arraysize(kFeatureEntries); 2145 *count = arraysize(kFeatureEntries);
2141 return kFeatureEntries; 2146 return kFeatureEntries;
2142 } 2147 }
2143 2148
2144 } // namespace testing 2149 } // namespace testing
2145 2150
2146 } // namespace about_flags 2151 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698