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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1014 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, | 1014 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, |
1015 kOsCrOS, | 1015 kOsCrOS, |
1016 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), | 1016 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), |
1017 }, | 1017 }, |
1018 { "ash-enable-tab-scrubbing", | 1018 { "ash-enable-tab-scrubbing", |
1019 IDS_FLAGS_ENABLE_TAB_SCRUBBING_NAME, | 1019 IDS_FLAGS_ENABLE_TAB_SCRUBBING_NAME, |
1020 IDS_FLAGS_ENABLE_TAB_SCRUBBING_DESCRIPTION, | 1020 IDS_FLAGS_ENABLE_TAB_SCRUBBING_DESCRIPTION, |
1021 kOsCrOS, | 1021 kOsCrOS, |
1022 SINGLE_VALUE_TYPE(switches::kAshEnableTabScrubbing), | 1022 SINGLE_VALUE_TYPE(switches::kAshEnableTabScrubbing), |
1023 }, | 1023 }, |
| 1024 { "ash-enable-workspace-scrubbing", |
| 1025 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME, |
| 1026 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION, |
| 1027 kOsCrOS, |
| 1028 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing), |
| 1029 }, |
1024 { "ash-enable-immersive-mode", | 1030 { "ash-enable-immersive-mode", |
1025 IDS_FLAGS_ENABLE_IMMERSIVE_MODE_NAME, | 1031 IDS_FLAGS_ENABLE_IMMERSIVE_MODE_NAME, |
1026 IDS_FLAGS_ENABLE_IMMERSIVE_MODE_DESCRIPTION, | 1032 IDS_FLAGS_ENABLE_IMMERSIVE_MODE_DESCRIPTION, |
1027 kOsCrOS, | 1033 kOsCrOS, |
1028 SINGLE_VALUE_TYPE(ash::switches::kAshImmersive), | 1034 SINGLE_VALUE_TYPE(ash::switches::kAshImmersive), |
1029 }, | 1035 }, |
1030 #if defined(OS_LINUX) | 1036 #if defined(OS_LINUX) |
1031 { "ash-enable-memory-monitor", | 1037 { "ash-enable-memory-monitor", |
1032 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, | 1038 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, |
1033 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, | 1039 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1584 } | 1590 } |
1585 | 1591 |
1586 const Experiment* GetExperiments(size_t* count) { | 1592 const Experiment* GetExperiments(size_t* count) { |
1587 *count = num_experiments; | 1593 *count = num_experiments; |
1588 return experiments; | 1594 return experiments; |
1589 } | 1595 } |
1590 | 1596 |
1591 } // namespace testing | 1597 } // namespace testing |
1592 | 1598 |
1593 } // namespace about_flags | 1599 } // namespace about_flags |
OLD | NEW |