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 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
781 SINGLE_VALUE_TYPE(switches::kEnablePinch), | 781 SINGLE_VALUE_TYPE(switches::kEnablePinch), |
782 }, | 782 }, |
783 { | 783 { |
784 "app-list-show-apps-only", | 784 "app-list-show-apps-only", |
785 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_NAME, | 785 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_NAME, |
786 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_DESCRIPTION, | 786 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_DESCRIPTION, |
787 kOsAll, | 787 kOsAll, |
788 SINGLE_VALUE_TYPE(app_list::switches::kAppListShowAppsOnly), | 788 SINGLE_VALUE_TYPE(app_list::switches::kAppListShowAppsOnly), |
789 }, | 789 }, |
790 { | 790 { |
791 "ash-extended-desktop-disabled", | 791 "ash-extended-desktop", |
792 IDS_FLAGS_DISABLE_ASH_EXTENDED_DESKTOP_NAME, | 792 IDS_FLAGS_ENABLE_ASH_EXTENDED_DESKTOP_NAME, |
793 IDS_FLAGS_DISABLE_ASH_EXTENDED_DESKTOP_DESCRIPTION, | 793 IDS_FLAGS_ENABLE_ASH_EXTENDED_DESKTOP_DESCRIPTION, |
794 kOsAll, | 794 kOsAll, |
795 SINGLE_VALUE_TYPE(ash::switches::kAshExtendedDesktopDisabled) | 795 SINGLE_VALUE_TYPE(ash::switches::kAshExtendedDesktop) |
796 }, | 796 }, |
797 #endif // defined(USE_ASH) | 797 #endif // defined(USE_ASH) |
798 #if defined(OS_CHROMEOS) | 798 #if defined(OS_CHROMEOS) |
799 { | 799 { |
800 "experimental-wallpaper-ui", | 800 "experimental-wallpaper-ui", |
801 IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_NAME, | 801 IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_NAME, |
802 IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_DESCRIPTION, | 802 IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_DESCRIPTION, |
803 kOsCrOS, | 803 kOsCrOS, |
804 SINGLE_VALUE_TYPE(switches::kExperimentalWallpaperUI) | 804 SINGLE_VALUE_TYPE(switches::kExperimentalWallpaperUI) |
805 }, | 805 }, |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1313 } | 1313 } |
1314 | 1314 |
1315 const Experiment* GetExperiments(size_t* count) { | 1315 const Experiment* GetExperiments(size_t* count) { |
1316 *count = num_experiments; | 1316 *count = num_experiments; |
1317 return experiments; | 1317 return experiments; |
1318 } | 1318 } |
1319 | 1319 |
1320 } // namespace testing | 1320 } // namespace testing |
1321 | 1321 |
1322 } // namespace about_flags | 1322 } // namespace about_flags |
OLD | NEW |