| 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 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1061 #endif | 1061 #endif |
| 1062 #if defined(USE_ASH) | 1062 #if defined(USE_ASH) |
| 1063 { | 1063 { |
| 1064 "disable-minimize-on-second-launcher-item-click", | 1064 "disable-minimize-on-second-launcher-item-click", |
| 1065 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, | 1065 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
| 1066 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, | 1066 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
| 1067 kOsAll, | 1067 kOsAll, |
| 1068 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) | 1068 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) |
| 1069 }, | 1069 }, |
| 1070 { | 1070 { |
| 1071 "disable-overview-mode", | |
| 1072 IDS_FLAGS_DISABLE_OVERVIEW_MODE_NAME, | |
| 1073 IDS_FLAGS_DISABLE_OVERVIEW_MODE_DESCRIPTION, | |
| 1074 kOsCrOS, | |
| 1075 SINGLE_VALUE_TYPE(ash::switches::kAshDisableOverviewMode) | |
| 1076 }, | |
| 1077 { | |
| 1078 "overview-delay-on-alt-tab", | 1071 "overview-delay-on-alt-tab", |
| 1079 IDS_FLAGS_OVERVIEW_DELAY_NAME, | 1072 IDS_FLAGS_OVERVIEW_DELAY_NAME, |
| 1080 IDS_FLAGS_OVERVIEW_DELAY_DESCRIPTION, | 1073 IDS_FLAGS_OVERVIEW_DELAY_DESCRIPTION, |
| 1081 kOsCrOS, | 1074 kOsCrOS, |
| 1082 MULTI_VALUE_TYPE(kAshOverviewDelayChoices) | 1075 MULTI_VALUE_TYPE(kAshOverviewDelayChoices) |
| 1083 }, | 1076 }, |
| 1084 { | 1077 { |
| 1085 "show-touch-hud", | 1078 "show-touch-hud", |
| 1086 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, | 1079 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, |
| 1087 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, | 1080 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, |
| (...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2462 } | 2455 } |
| 2463 | 2456 |
| 2464 const Experiment* GetExperiments(size_t* count) { | 2457 const Experiment* GetExperiments(size_t* count) { |
| 2465 *count = num_experiments; | 2458 *count = num_experiments; |
| 2466 return experiments; | 2459 return experiments; |
| 2467 } | 2460 } |
| 2468 | 2461 |
| 2469 } // namespace testing | 2462 } // namespace testing |
| 2470 | 2463 |
| 2471 } // namespace about_flags | 2464 } // namespace about_flags |
| OLD | NEW |