| 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 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 927 kOsAll, | 927 kOsAll, |
| 928 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures) | 928 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures) |
| 929 }, | 929 }, |
| 930 { | 930 { |
| 931 "disable-ntp-other-sessions-menu", | 931 "disable-ntp-other-sessions-menu", |
| 932 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, | 932 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, |
| 933 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, | 933 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, |
| 934 kOsDesktop, | 934 kOsDesktop, |
| 935 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) | 935 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) |
| 936 }, | 936 }, |
| 937 #if defined(USE_ASH) | |
| 938 { | |
| 939 "enable-ash-oak", | |
| 940 IDS_FLAGS_ENABLE_ASH_OAK_NAME, | |
| 941 IDS_FLAGS_ENABLE_ASH_OAK_DESCRIPTION, | |
| 942 kOsAll, | |
| 943 SINGLE_VALUE_TYPE(ash::switches::kAshEnableOak), | |
| 944 }, | |
| 945 #endif | |
| 946 { | 937 { |
| 947 "enable-devtools-experiments", | 938 "enable-devtools-experiments", |
| 948 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, | 939 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, |
| 949 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION, | 940 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION, |
| 950 kOsDesktop, | 941 kOsDesktop, |
| 951 SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments) | 942 SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments) |
| 952 }, | 943 }, |
| 953 { | 944 { |
| 954 "silent-debugger-extension-api", | 945 "silent-debugger-extension-api", |
| 955 IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_NAME, | 946 IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_NAME, |
| (...skipping 1548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2504 } | 2495 } |
| 2505 | 2496 |
| 2506 const Experiment* GetExperiments(size_t* count) { | 2497 const Experiment* GetExperiments(size_t* count) { |
| 2507 *count = num_experiments; | 2498 *count = num_experiments; |
| 2508 return experiments; | 2499 return experiments; |
| 2509 } | 2500 } |
| 2510 | 2501 |
| 2511 } // namespace testing | 2502 } // namespace testing |
| 2512 | 2503 |
| 2513 } // namespace about_flags | 2504 } // namespace about_flags |
| OLD | NEW |