| 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 693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 #endif | 704 #endif |
| 705 { | 705 { |
| 706 "disable-client-oauth-signin", | 706 "disable-client-oauth-signin", |
| 707 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_NAME, | 707 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_NAME, |
| 708 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION, | 708 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION, |
| 709 kOsMac | kOsWin | kOsLinux, | 709 kOsMac | kOsWin | kOsLinux, |
| 710 SINGLE_VALUE_TYPE(switches::kDisableClientOAuthSignin) | 710 SINGLE_VALUE_TYPE(switches::kDisableClientOAuthSignin) |
| 711 }, | 711 }, |
| 712 #if defined(USE_ASH) | 712 #if defined(USE_ASH) |
| 713 { | 713 { |
| 714 "enable-applist-v2", | |
| 715 IDS_FLAGS_ENABLE_APPLIST_V2_NAME, | |
| 716 IDS_FLAGS_ENABLE_APPLIST_V2_DESCRIPTION, | |
| 717 kOsAll, | |
| 718 SINGLE_VALUE_TYPE(ash::switches::kEnableAppListV2), | |
| 719 }, | |
| 720 { | |
| 721 "show-launcher-alignment-menu", | 714 "show-launcher-alignment-menu", |
| 722 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, | 715 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, |
| 723 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, | 716 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, |
| 724 kOsAll, | 717 kOsAll, |
| 725 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) | 718 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) |
| 726 }, | 719 }, |
| 727 { | 720 { |
| 728 "show-touch-hud", | 721 "show-touch-hud", |
| 729 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, | 722 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, |
| 730 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, | 723 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1190 } | 1183 } |
| 1191 | 1184 |
| 1192 const Experiment* GetExperiments(size_t* count) { | 1185 const Experiment* GetExperiments(size_t* count) { |
| 1193 *count = num_experiments; | 1186 *count = num_experiments; |
| 1194 return experiments; | 1187 return experiments; |
| 1195 } | 1188 } |
| 1196 | 1189 |
| 1197 } // namespace testing | 1190 } // namespace testing |
| 1198 | 1191 |
| 1199 } // namespace about_flags | 1192 } // namespace about_flags |
| OLD | NEW |