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 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
723 }, | 723 }, |
724 #if defined(USE_ASH) | 724 #if defined(USE_ASH) |
725 { | 725 { |
726 "ash-disable-auto-window-placement", | 726 "ash-disable-auto-window-placement", |
727 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME, | 727 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME, |
728 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_DESCRIPTION, | 728 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_DESCRIPTION, |
729 kOsWin | kOsLinux | kOsCrOS, | 729 kOsWin | kOsLinux | kOsCrOS, |
730 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoWindowPlacement) | 730 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoWindowPlacement) |
731 }, | 731 }, |
732 { | 732 { |
733 "ash-enable-per-app-launcher", | 733 "ash-disable-per-app-launcher", |
734 IDS_FLAGS_ASH_ENABLE_PER_APP_LAUNCHER_NAME, | 734 IDS_FLAGS_ASH_DISABLE_PER_APP_LAUNCHER_NAME, |
735 IDS_FLAGS_ASH_ENABLE_PER_APP_LAUNCHER_DESCRIPTION, | 735 IDS_FLAGS_ASH_DISABLE_PER_APP_LAUNCHER_DESCRIPTION, |
736 kOsWin | kOsLinux | kOsCrOS, | 736 kOsWin | kOsLinux | kOsCrOS, |
737 SINGLE_VALUE_TYPE(ash::switches::kAshEnablePerAppLauncher) | 737 SINGLE_VALUE_TYPE(ash::switches::kAshDisablePerAppLauncher) |
738 }, | 738 }, |
739 #endif | 739 #endif |
740 { | 740 { |
741 "per-tile-painting", | 741 "per-tile-painting", |
742 IDS_FLAGS_PER_TILE_PAINTING_NAME, | 742 IDS_FLAGS_PER_TILE_PAINTING_NAME, |
743 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, | 743 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, |
744 #if defined(USE_SKIA) | 744 #if defined(USE_SKIA) |
745 kOsMac | kOsLinux | kOsCrOS, | 745 kOsMac | kOsLinux | kOsCrOS, |
746 #else | 746 #else |
747 0, | 747 0, |
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1711 } | 1711 } |
1712 | 1712 |
1713 const Experiment* GetExperiments(size_t* count) { | 1713 const Experiment* GetExperiments(size_t* count) { |
1714 *count = num_experiments; | 1714 *count = num_experiments; |
1715 return experiments; | 1715 return experiments; |
1716 } | 1716 } |
1717 | 1717 |
1718 } // namespace testing | 1718 } // namespace testing |
1719 | 1719 |
1720 } // namespace about_flags | 1720 } // namespace about_flags |
OLD | NEW |