| 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 2057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2068 SINGLE_VALUE_TYPE(switches::kEnableNewTaskManager) | 2068 SINGLE_VALUE_TYPE(switches::kEnableNewTaskManager) |
| 2069 }, | 2069 }, |
| 2070 #endif // defined(ENABLE_TASK_MANAGER) | 2070 #endif // defined(ENABLE_TASK_MANAGER) |
| 2071 {"simplified-fullscreen-ui", | 2071 {"simplified-fullscreen-ui", |
| 2072 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, | 2072 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, |
| 2073 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, | 2073 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, |
| 2074 kOsDesktop, | 2074 kOsDesktop, |
| 2075 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSimplifiedFullscreenUI, | 2075 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSimplifiedFullscreenUI, |
| 2076 switches::kDisableSimplifiedFullscreenUI) | 2076 switches::kDisableSimplifiedFullscreenUI) |
| 2077 }, | 2077 }, |
| 2078 #if defined(OS_ANDROID) |
| 2079 {"enable-ntp-popular-sites", |
| 2080 IDS_FLAGS_NTP_POPULAR_SITES_NAME, |
| 2081 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, |
| 2082 kOsAndroid, |
| 2083 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, |
| 2084 switches::kDisableNTPPopularSites)}, |
| 2085 #endif // defined(OS_ANDROID) |
| 2078 // NOTE: Adding new command-line switches requires adding corresponding | 2086 // NOTE: Adding new command-line switches requires adding corresponding |
| 2079 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2087 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2080 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2088 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2081 }; | 2089 }; |
| 2082 | 2090 |
| 2083 const Experiment* experiments = kExperiments; | 2091 const Experiment* experiments = kExperiments; |
| 2084 size_t num_experiments = arraysize(kExperiments); | 2092 size_t num_experiments = arraysize(kExperiments); |
| 2085 | 2093 |
| 2086 // Stores and encapsulates the little state that about:flags has. | 2094 // Stores and encapsulates the little state that about:flags has. |
| 2087 class FlagsState { | 2095 class FlagsState { |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2710 } | 2718 } |
| 2711 | 2719 |
| 2712 const Experiment* GetExperiments(size_t* count) { | 2720 const Experiment* GetExperiments(size_t* count) { |
| 2713 *count = num_experiments; | 2721 *count = num_experiments; |
| 2714 return experiments; | 2722 return experiments; |
| 2715 } | 2723 } |
| 2716 | 2724 |
| 2717 } // namespace testing | 2725 } // namespace testing |
| 2718 | 2726 |
| 2719 } // namespace about_flags | 2727 } // namespace about_flags |
| OLD | NEW |