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 1952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1963 IDS_FLAGS_ENABLE_TAB_DISCARDING_DESCRIPTION, | 1963 IDS_FLAGS_ENABLE_TAB_DISCARDING_DESCRIPTION, |
1964 kOsWin | kOsMac, | 1964 kOsWin | kOsMac, |
1965 SINGLE_VALUE_TYPE(switches::kEnableTabDiscarding)}, | 1965 SINGLE_VALUE_TYPE(switches::kEnableTabDiscarding)}, |
1966 #endif | 1966 #endif |
1967 {"enable-clear-browsing-data-counters", | 1967 {"enable-clear-browsing-data-counters", |
1968 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, | 1968 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, |
1969 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, | 1969 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, |
1970 kOsAll, | 1970 kOsAll, |
1971 SINGLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters) | 1971 SINGLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters) |
1972 }, | 1972 }, |
| 1973 {"simple-clear-browsing-data-support-string", |
| 1974 IDS_FLAGS_SIMPLE_CLEAR_BROWSING_DATA_SUPPORT_STRING_NAME, |
| 1975 IDS_FLAGS_SIMPLE_CLEAR_BROWSING_DATA_SUPPORT_STRING_DESCRIPTION, |
| 1976 kOsAll, |
| 1977 SINGLE_VALUE_TYPE(switches::kSimpleClearBrowsingDataSupportString) |
| 1978 }, |
1973 #if defined(ENABLE_TASK_MANAGER) | 1979 #if defined(ENABLE_TASK_MANAGER) |
1974 {"disable-new-task-manager", | 1980 {"disable-new-task-manager", |
1975 IDS_FLAGS_DISABLE_NEW_TASK_MANAGER_NAME, | 1981 IDS_FLAGS_DISABLE_NEW_TASK_MANAGER_NAME, |
1976 IDS_FLAGS_DISABLE_NEW_TASK_MANAGER_DESCRIPTION, | 1982 IDS_FLAGS_DISABLE_NEW_TASK_MANAGER_DESCRIPTION, |
1977 kOsDesktop, | 1983 kOsDesktop, |
1978 SINGLE_VALUE_TYPE(switches::kDisableNewTaskManager) | 1984 SINGLE_VALUE_TYPE(switches::kDisableNewTaskManager) |
1979 }, | 1985 }, |
1980 #endif // defined(ENABLE_TASK_MANAGER) | 1986 #endif // defined(ENABLE_TASK_MANAGER) |
1981 {"simplified-fullscreen-ui", | 1987 {"simplified-fullscreen-ui", |
1982 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, | 1988 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2701 } | 2707 } |
2702 | 2708 |
2703 const Experiment* GetExperiments(size_t* count) { | 2709 const Experiment* GetExperiments(size_t* count) { |
2704 *count = num_experiments; | 2710 *count = num_experiments; |
2705 return experiments; | 2711 return experiments; |
2706 } | 2712 } |
2707 | 2713 |
2708 } // namespace testing | 2714 } // namespace testing |
2709 | 2715 |
2710 } // namespace about_flags | 2716 } // namespace about_flags |
OLD | NEW |