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 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1021 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, | 1021 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, |
1022 kOsCrOS, | 1022 kOsCrOS, |
1023 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), | 1023 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), |
1024 }, | 1024 }, |
1025 { "ash-enable-tab-scrubbing", | 1025 { "ash-enable-tab-scrubbing", |
1026 IDS_FLAGS_ENABLE_TAB_SCRUBBING_NAME, | 1026 IDS_FLAGS_ENABLE_TAB_SCRUBBING_NAME, |
1027 IDS_FLAGS_ENABLE_TAB_SCRUBBING_DESCRIPTION, | 1027 IDS_FLAGS_ENABLE_TAB_SCRUBBING_DESCRIPTION, |
1028 kOsCrOS, | 1028 kOsCrOS, |
1029 SINGLE_VALUE_TYPE(switches::kAshEnableTabScrubbing), | 1029 SINGLE_VALUE_TYPE(switches::kAshEnableTabScrubbing), |
1030 }, | 1030 }, |
| 1031 { "ash-enable-workspace-scrubbing", |
| 1032 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME, |
| 1033 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION, |
| 1034 kOsCrOS, |
| 1035 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing), |
| 1036 }, |
1031 { "ash-enable-immersive-mode", | 1037 { "ash-enable-immersive-mode", |
1032 IDS_FLAGS_ENABLE_IMMERSIVE_MODE_NAME, | 1038 IDS_FLAGS_ENABLE_IMMERSIVE_MODE_NAME, |
1033 IDS_FLAGS_ENABLE_IMMERSIVE_MODE_DESCRIPTION, | 1039 IDS_FLAGS_ENABLE_IMMERSIVE_MODE_DESCRIPTION, |
1034 kOsCrOS, | 1040 kOsCrOS, |
1035 SINGLE_VALUE_TYPE(ash::switches::kAshImmersive), | 1041 SINGLE_VALUE_TYPE(ash::switches::kAshImmersive), |
1036 }, | 1042 }, |
1037 #if defined(OS_LINUX) | 1043 #if defined(OS_LINUX) |
1038 { "ash-enable-memory-monitor", | 1044 { "ash-enable-memory-monitor", |
1039 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, | 1045 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, |
1040 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, | 1046 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1591 } | 1597 } |
1592 | 1598 |
1593 const Experiment* GetExperiments(size_t* count) { | 1599 const Experiment* GetExperiments(size_t* count) { |
1594 *count = num_experiments; | 1600 *count = num_experiments; |
1595 return experiments; | 1601 return experiments; |
1596 } | 1602 } |
1597 | 1603 |
1598 } // namespace testing | 1604 } // namespace testing |
1599 | 1605 |
1600 } // namespace about_flags | 1606 } // namespace about_flags |
OLD | NEW |