| 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 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1047 #endif | 1047 #endif |
| 1048 #if defined(USE_ASH) | 1048 #if defined(USE_ASH) |
| 1049 { | 1049 { |
| 1050 "disable-minimize-on-second-launcher-item-click", | 1050 "disable-minimize-on-second-launcher-item-click", |
| 1051 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, | 1051 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
| 1052 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, | 1052 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
| 1053 kOsAll, | 1053 kOsAll, |
| 1054 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) | 1054 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) |
| 1055 }, | 1055 }, |
| 1056 { | 1056 { |
| 1057 "disable-overview-mode", | |
| 1058 IDS_FLAGS_DISABLE_OVERVIEW_MODE_NAME, | |
| 1059 IDS_FLAGS_DISABLE_OVERVIEW_MODE_DESCRIPTION, | |
| 1060 kOsCrOS, | |
| 1061 SINGLE_VALUE_TYPE(ash::switches::kAshDisableOverviewMode) | |
| 1062 }, | |
| 1063 { | |
| 1064 "show-touch-hud", | 1057 "show-touch-hud", |
| 1065 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, | 1058 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, |
| 1066 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, | 1059 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, |
| 1067 kOsAll, | 1060 kOsAll, |
| 1068 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) | 1061 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) |
| 1069 }, | 1062 }, |
| 1070 { | 1063 { |
| 1071 "enable-pinch", | 1064 "enable-pinch", |
| 1072 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, | 1065 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, |
| 1073 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, | 1066 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, |
| (...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2441 } | 2434 } |
| 2442 | 2435 |
| 2443 const Experiment* GetExperiments(size_t* count) { | 2436 const Experiment* GetExperiments(size_t* count) { |
| 2444 *count = num_experiments; | 2437 *count = num_experiments; |
| 2445 return experiments; | 2438 return experiments; |
| 2446 } | 2439 } |
| 2447 | 2440 |
| 2448 } // namespace testing | 2441 } // namespace testing |
| 2449 | 2442 |
| 2450 } // namespace about_flags | 2443 } // namespace about_flags |
| OLD | NEW |