| 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 801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 812 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebKitFeatures) | 812 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebKitFeatures) |
| 813 }, | 813 }, |
| 814 { | 814 { |
| 815 "enable-css-shaders", | 815 "enable-css-shaders", |
| 816 IDS_FLAGS_CSS_SHADERS_NAME, | 816 IDS_FLAGS_CSS_SHADERS_NAME, |
| 817 IDS_FLAGS_CSS_SHADERS_DESCRIPTION, | 817 IDS_FLAGS_CSS_SHADERS_DESCRIPTION, |
| 818 kOsAll, | 818 kOsAll, |
| 819 SINGLE_VALUE_TYPE(switches::kEnableCssShaders) | 819 SINGLE_VALUE_TYPE(switches::kEnableCssShaders) |
| 820 }, | 820 }, |
| 821 { | 821 { |
| 822 "enable-extension-activity-ui", | |
| 823 IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_NAME, | |
| 824 IDS_FLAGS_ENABLE_EXTENSION_ACTIVITY_UI_DESCRIPTION, | |
| 825 kOsDesktop, | |
| 826 SINGLE_VALUE_TYPE(switches::kEnableExtensionActivityUI) | |
| 827 }, | |
| 828 { | |
| 829 "disable-ntp-other-sessions-menu", | 822 "disable-ntp-other-sessions-menu", |
| 830 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, | 823 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, |
| 831 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, | 824 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, |
| 832 kOsDesktop, | 825 kOsDesktop, |
| 833 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) | 826 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) |
| 834 }, | 827 }, |
| 835 #if defined(USE_ASH) | 828 #if defined(USE_ASH) |
| 836 { | 829 { |
| 837 "enable-ash-oak", | 830 "enable-ash-oak", |
| 838 IDS_FLAGS_ENABLE_ASH_OAK_NAME, | 831 IDS_FLAGS_ENABLE_ASH_OAK_NAME, |
| (...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1965 } | 1958 } |
| 1966 | 1959 |
| 1967 const Experiment* GetExperiments(size_t* count) { | 1960 const Experiment* GetExperiments(size_t* count) { |
| 1968 *count = num_experiments; | 1961 *count = num_experiments; |
| 1969 return experiments; | 1962 return experiments; |
| 1970 } | 1963 } |
| 1971 | 1964 |
| 1972 } // namespace testing | 1965 } // namespace testing |
| 1973 | 1966 |
| 1974 } // namespace about_flags | 1967 } // namespace about_flags |
| OLD | NEW |