| 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 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 kOsCrOS, | 1113 kOsCrOS, |
| 1114 SINGLE_VALUE_TYPE(switches::kEnableContacts) | 1114 SINGLE_VALUE_TYPE(switches::kEnableContacts) |
| 1115 }, | 1115 }, |
| 1116 #if defined(USE_ASH) | 1116 #if defined(USE_ASH) |
| 1117 { "ash-enable-advanced-gestures", | 1117 { "ash-enable-advanced-gestures", |
| 1118 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME, | 1118 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME, |
| 1119 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, | 1119 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, |
| 1120 kOsCrOS, | 1120 kOsCrOS, |
| 1121 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), | 1121 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), |
| 1122 }, | 1122 }, |
| 1123 { "ash-enable-tab-scrubbing", | 1123 { "ash-disable-tab-scrubbing", |
| 1124 IDS_FLAGS_ENABLE_TAB_SCRUBBING_NAME, | 1124 IDS_FLAGS_DISABLE_TAB_SCRUBBING_NAME, |
| 1125 IDS_FLAGS_ENABLE_TAB_SCRUBBING_DESCRIPTION, | 1125 IDS_FLAGS_DISABLE_TAB_SCRUBBING_DESCRIPTION, |
| 1126 kOsCrOS, | 1126 kOsCrOS, |
| 1127 SINGLE_VALUE_TYPE(switches::kAshEnableTabScrubbing), | 1127 SINGLE_VALUE_TYPE(switches::kAshDisableTabScrubbing), |
| 1128 }, | 1128 }, |
| 1129 { "ash-enable-workspace-scrubbing", | 1129 { "ash-enable-workspace-scrubbing", |
| 1130 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME, | 1130 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME, |
| 1131 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION, | 1131 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION, |
| 1132 kOsCrOS, | 1132 kOsCrOS, |
| 1133 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing), | 1133 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing), |
| 1134 }, | 1134 }, |
| 1135 { "ash-immersive-mode", | 1135 { "ash-immersive-mode", |
| 1136 IDS_FLAGS_ASH_IMMERSIVE_MODE_NAME, | 1136 IDS_FLAGS_ASH_IMMERSIVE_MODE_NAME, |
| 1137 IDS_FLAGS_ASH_IMMERSIVE_MODE_DESCRIPTION, | 1137 IDS_FLAGS_ASH_IMMERSIVE_MODE_DESCRIPTION, |
| (...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1711 } | 1711 } |
| 1712 | 1712 |
| 1713 const Experiment* GetExperiments(size_t* count) { | 1713 const Experiment* GetExperiments(size_t* count) { |
| 1714 *count = num_experiments; | 1714 *count = num_experiments; |
| 1715 return experiments; | 1715 return experiments; |
| 1716 } | 1716 } |
| 1717 | 1717 |
| 1718 } // namespace testing | 1718 } // namespace testing |
| 1719 | 1719 |
| 1720 } // namespace about_flags | 1720 } // namespace about_flags |
| OLD | NEW |