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

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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_feature_list.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 1991 matching lines...) Expand 10 before | Expand all | Expand 10 after
2002 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)}, 2002 SINGLE_VALUE_TYPE(switches::kEnableIntentPicker)},
2003 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, 2003 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME,
2004 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, 2004 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS,
2005 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, 2005 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView,
2006 chromeos::switches::kDisableFilesQuickView)}, 2006 chromeos::switches::kDisableFilesQuickView)},
2007 #endif // defined(OS_CHROMEOS) 2007 #endif // defined(OS_CHROMEOS)
2008 #if defined(OS_ANDROID) 2008 #if defined(OS_ANDROID)
2009 {"multi-instance-merge-tabs", IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_NAME, 2009 {"multi-instance-merge-tabs", IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_NAME,
2010 IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_DESCRIPTION, kOsAndroid, 2010 IDS_FLAGS_MULTI_INSTANCE_MERGE_TABS_DESCRIPTION, kOsAndroid,
2011 SINGLE_VALUE_TYPE(switches::kMultiInstanceMergeTabs)}, 2011 SINGLE_VALUE_TYPE(switches::kMultiInstanceMergeTabs)},
2012 #endif 2012 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME,
2013 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid,
2014 FEATURE_VALUE_TYPE(features::kWebPayments)},
2015 #endif // defined(OS_ANDROID)
2013 // NOTE: Adding new command-line switches requires adding corresponding 2016 // NOTE: Adding new command-line switches requires adding corresponding
2014 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2017 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2015 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2018 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2016 }; 2019 };
2017 2020
2018 class FlagsStateSingleton { 2021 class FlagsStateSingleton {
2019 public: 2022 public:
2020 FlagsStateSingleton() 2023 FlagsStateSingleton()
2021 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 2024 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
2022 ~FlagsStateSingleton() {} 2025 ~FlagsStateSingleton() {}
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
2193 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2196 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2194 2197
2195 const FeatureEntry* GetFeatureEntries(size_t* count) { 2198 const FeatureEntry* GetFeatureEntries(size_t* count) {
2196 *count = arraysize(kFeatureEntries); 2199 *count = arraysize(kFeatureEntries);
2197 return kFeatureEntries; 2200 return kFeatureEntries;
2198 } 2201 }
2199 2202
2200 } // namespace testing 2203 } // namespace testing
2201 2204
2202 } // namespace about_flags 2205 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_feature_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698