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 2041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2052 IDS_FLAGS_ENABLE_TAB_DISCARDING_DESCRIPTION, | 2052 IDS_FLAGS_ENABLE_TAB_DISCARDING_DESCRIPTION, |
2053 kOsWin, | 2053 kOsWin, |
2054 SINGLE_VALUE_TYPE(switches::kEnableTabDiscarding)}, | 2054 SINGLE_VALUE_TYPE(switches::kEnableTabDiscarding)}, |
2055 #endif | 2055 #endif |
2056 {"enable-clear-browsing-data-counters", | 2056 {"enable-clear-browsing-data-counters", |
2057 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, | 2057 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, |
2058 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, | 2058 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, |
2059 kOsAll, | 2059 kOsAll, |
2060 SINGLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters) | 2060 SINGLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters) |
2061 }, | 2061 }, |
| 2062 #if defined(ENABLE_TASK_MANAGER) |
| 2063 {"enable-new-task-manager", |
| 2064 IDS_FLAGS_ENABLE_NEW_TASK_MANAGER_NAME, |
| 2065 IDS_FLAGS_ENABLE_NEW_TASK_MANAGER_DESCRIPTION, |
| 2066 kOsDesktop, |
| 2067 SINGLE_VALUE_TYPE(switches::kEnableNewTaskManager) |
| 2068 }, |
| 2069 #endif // defined(ENABLE_TASK_MANAGER) |
2062 // NOTE: Adding new command-line switches requires adding corresponding | 2070 // NOTE: Adding new command-line switches requires adding corresponding |
2063 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2071 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2064 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2072 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2065 }; | 2073 }; |
2066 | 2074 |
2067 const Experiment* experiments = kExperiments; | 2075 const Experiment* experiments = kExperiments; |
2068 size_t num_experiments = arraysize(kExperiments); | 2076 size_t num_experiments = arraysize(kExperiments); |
2069 | 2077 |
2070 // Stores and encapsulates the little state that about:flags has. | 2078 // Stores and encapsulates the little state that about:flags has. |
2071 class FlagsState { | 2079 class FlagsState { |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2694 } | 2702 } |
2695 | 2703 |
2696 const Experiment* GetExperiments(size_t* count) { | 2704 const Experiment* GetExperiments(size_t* count) { |
2697 *count = num_experiments; | 2705 *count = num_experiments; |
2698 return experiments; | 2706 return experiments; |
2699 } | 2707 } |
2700 | 2708 |
2701 } // namespace testing | 2709 } // namespace testing |
2702 | 2710 |
2703 } // namespace about_flags | 2711 } // namespace about_flags |
OLD | NEW |