| 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 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 #endif | 1030 #endif |
| 1031 #if defined(USE_ASH) | 1031 #if defined(USE_ASH) |
| 1032 { | 1032 { |
| 1033 "disable-minimize-on-second-launcher-item-click", | 1033 "disable-minimize-on-second-launcher-item-click", |
| 1034 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, | 1034 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
| 1035 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, | 1035 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
| 1036 kOsAll, | 1036 kOsAll, |
| 1037 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) | 1037 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) |
| 1038 }, | 1038 }, |
| 1039 { | 1039 { |
| 1040 "disable-overview-mode", | |
| 1041 IDS_FLAGS_DISABLE_OVERVIEW_MODE_NAME, | |
| 1042 IDS_FLAGS_DISABLE_OVERVIEW_MODE_DESCRIPTION, | |
| 1043 kOsCrOS, | |
| 1044 SINGLE_VALUE_TYPE(ash::switches::kAshDisableOverviewMode) | |
| 1045 }, | |
| 1046 { | |
| 1047 "show-touch-hud", | 1040 "show-touch-hud", |
| 1048 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, | 1041 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, |
| 1049 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, | 1042 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, |
| 1050 kOsAll, | 1043 kOsAll, |
| 1051 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) | 1044 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) |
| 1052 }, | 1045 }, |
| 1053 { | 1046 { |
| 1054 "enable-pinch", | 1047 "enable-pinch", |
| 1055 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, | 1048 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, |
| 1056 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, | 1049 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, |
| (...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2431 } | 2424 } |
| 2432 | 2425 |
| 2433 const Experiment* GetExperiments(size_t* count) { | 2426 const Experiment* GetExperiments(size_t* count) { |
| 2434 *count = num_experiments; | 2427 *count = num_experiments; |
| 2435 return experiments; | 2428 return experiments; |
| 2436 } | 2429 } |
| 2437 | 2430 |
| 2438 } // namespace testing | 2431 } // namespace testing |
| 2439 | 2432 |
| 2440 } // namespace about_flags | 2433 } // namespace about_flags |
| OLD | NEW |