OLD | NEW |
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 1890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1901 FEATURE_VALUE_TYPE(features::kOptimizeLoadingIPCForSmallResources)}, | 1901 FEATURE_VALUE_TYPE(features::kOptimizeLoadingIPCForSmallResources)}, |
1902 {"enable-font-cache-scaling", IDS_FLAGS_FONT_CACHE_SCALING_NAME, | 1902 {"enable-font-cache-scaling", IDS_FLAGS_FONT_CACHE_SCALING_NAME, |
1903 IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll, | 1903 IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll, |
1904 FEATURE_VALUE_TYPE(features::kFontCacheScaling)}, | 1904 FEATURE_VALUE_TYPE(features::kFontCacheScaling)}, |
1905 #if defined(OS_ANDROID) | 1905 #if defined(OS_ANDROID) |
1906 {"enable-vr-shell", | 1906 {"enable-vr-shell", |
1907 IDS_FLAGS_ENABLE_VR_SHELL_NAME, | 1907 IDS_FLAGS_ENABLE_VR_SHELL_NAME, |
1908 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, | 1908 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, |
1909 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, | 1909 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, |
1910 switches::kDisableVrShell)}, | 1910 switches::kDisableVrShell)}, |
| 1911 {"enable-android-pay-integration-v1", |
| 1912 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, |
| 1913 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, |
| 1914 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, |
1911 #endif | 1915 #endif |
1912 | |
1913 {"enable-weak-memorycache", | 1916 {"enable-weak-memorycache", |
1914 IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_NAME, | 1917 IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_NAME, |
1915 IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_DESCRIPTION, kOsAll, | 1918 IDS_FLAGS_ENABLE_WEAK_MEMORYCACHE_DESCRIPTION, kOsAll, |
1916 FEATURE_VALUE_TYPE(features::kWeakMemoryCache)}, | 1919 FEATURE_VALUE_TYPE(features::kWeakMemoryCache)}, |
| 1920 |
1917 // NOTE: Adding new command-line switches requires adding corresponding | 1921 // NOTE: Adding new command-line switches requires adding corresponding |
1918 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1922 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
1919 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1923 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
1920 }; | 1924 }; |
1921 | 1925 |
1922 class FlagsStateSingleton { | 1926 class FlagsStateSingleton { |
1923 public: | 1927 public: |
1924 FlagsStateSingleton() | 1928 FlagsStateSingleton() |
1925 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 1929 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
1926 ~FlagsStateSingleton() {} | 1930 ~FlagsStateSingleton() {} |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2106 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2110 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2107 | 2111 |
2108 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2112 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2109 *count = arraysize(kFeatureEntries); | 2113 *count = arraysize(kFeatureEntries); |
2110 return kFeatureEntries; | 2114 return kFeatureEntries; |
2111 } | 2115 } |
2112 | 2116 |
2113 } // namespace testing | 2117 } // namespace testing |
2114 | 2118 |
2115 } // namespace about_flags | 2119 } // namespace about_flags |
OLD | NEW |