| 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 2019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2030 kOsAndroid, | 2030 kOsAndroid, |
| 2031 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, | 2031 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, |
| 2032 autofill::switches::kDisableCreditCardScan) | 2032 autofill::switches::kDisableCreditCardScan) |
| 2033 }, | 2033 }, |
| 2034 #if defined(OS_CHROMEOS) | 2034 #if defined(OS_CHROMEOS) |
| 2035 { | 2035 { |
| 2036 "enable-captive-portal-bypass-proxy", | 2036 "enable-captive-portal-bypass-proxy", |
| 2037 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, | 2037 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, |
| 2038 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, | 2038 IDS_FLAGS_ENABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, |
| 2039 kOsCrOS, | 2039 kOsCrOS, |
| 2040 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxy) | 2040 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCaptivePortalBypassProxyOption) |
| 2041 }, | 2041 }, |
| 2042 { | 2042 { |
| 2043 "enable-roboto-font-ui", | 2043 "enable-roboto-font-ui", |
| 2044 IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_NAME, | 2044 IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_NAME, |
| 2045 IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_DESCRIPTION, | 2045 IDS_FLAGS_ENABLE_ROBOTO_FONT_UI_DESCRIPTION, |
| 2046 kOsCrOS, | 2046 kOsCrOS, |
| 2047 SINGLE_VALUE_TYPE(switches::kEnableRobotoFontUI) | 2047 SINGLE_VALUE_TYPE(switches::kEnableRobotoFontUI) |
| 2048 }, | 2048 }, |
| 2049 #endif // defined(OS_CHROMEOS) | 2049 #endif // defined(OS_CHROMEOS) |
| 2050 #if defined(OS_ANDROID) | 2050 #if defined(OS_ANDROID) |
| (...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2643 } | 2643 } |
| 2644 | 2644 |
| 2645 const Experiment* GetExperiments(size_t* count) { | 2645 const Experiment* GetExperiments(size_t* count) { |
| 2646 *count = num_experiments; | 2646 *count = num_experiments; |
| 2647 return experiments; | 2647 return experiments; |
| 2648 } | 2648 } |
| 2649 | 2649 |
| 2650 } // namespace testing | 2650 } // namespace testing |
| 2651 | 2651 |
| 2652 } // namespace about_flags | 2652 } // namespace about_flags |
| OLD | NEW |