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 <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <iterator> | 10 #include <iterator> |
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1115 IDS_FLAGS_DISABLE_TAB_SCRUBBING_DESCRIPTION, | 1115 IDS_FLAGS_DISABLE_TAB_SCRUBBING_DESCRIPTION, |
1116 kOsCrOS, | 1116 kOsCrOS, |
1117 SINGLE_VALUE_TYPE(switches::kAshDisableTabScrubbing), | 1117 SINGLE_VALUE_TYPE(switches::kAshDisableTabScrubbing), |
1118 }, | 1118 }, |
1119 { "ash-enable-workspace-scrubbing", | 1119 { "ash-enable-workspace-scrubbing", |
1120 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME, | 1120 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME, |
1121 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION, | 1121 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION, |
1122 kOsCrOS, | 1122 kOsCrOS, |
1123 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing), | 1123 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing), |
1124 }, | 1124 }, |
1125 { "ash-immersive-fullscreen", | 1125 { "ash-immersive-fullscreen-2", |
1126 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_NAME, | 1126 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_NAME, |
1127 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_DESCRIPTION, | 1127 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_DESCRIPTION, |
1128 kOsCrOS, | 1128 kOsCrOS, |
1129 SINGLE_VALUE_TYPE(ash::switches::kAshImmersiveFullscreen), | 1129 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableImmersiveFullscreen, |
| 1130 ash::switches::kAshDisableImmersiveFullscreen), |
1130 }, | 1131 }, |
1131 #if defined(OS_LINUX) | 1132 #if defined(OS_LINUX) |
1132 { "ash-enable-memory-monitor", | 1133 { "ash-enable-memory-monitor", |
1133 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, | 1134 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, |
1134 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, | 1135 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, |
1135 kOsCrOS, | 1136 kOsCrOS, |
1136 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMemoryMonitor), | 1137 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMemoryMonitor), |
1137 }, | 1138 }, |
1138 #endif | 1139 #endif |
1139 #endif | 1140 #endif |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1858 } | 1859 } |
1859 | 1860 |
1860 const Experiment* GetExperiments(size_t* count) { | 1861 const Experiment* GetExperiments(size_t* count) { |
1861 *count = num_experiments; | 1862 *count = num_experiments; |
1862 return experiments; | 1863 return experiments; |
1863 } | 1864 } |
1864 | 1865 |
1865 } // namespace testing | 1866 } // namespace testing |
1866 | 1867 |
1867 } // namespace about_flags | 1868 } // namespace about_flags |
OLD | NEW |