| 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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 }, | 594 }, |
| 595 { | 595 { |
| 596 "disable-ntp-other-sessions-menu", | 596 "disable-ntp-other-sessions-menu", |
| 597 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, | 597 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, |
| 598 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, | 598 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, |
| 599 kOsAll, | 599 kOsAll, |
| 600 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) | 600 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) |
| 601 }, | 601 }, |
| 602 #if defined(USE_ASH) | 602 #if defined(USE_ASH) |
| 603 { | 603 { |
| 604 "disable-ash-uber-tray", | |
| 605 IDS_FLAGS_DISABLE_ASH_UBER_TRAY_NAME, | |
| 606 IDS_FLAGS_DISABLE_ASH_UBER_TRAY_DESCRIPTION, | |
| 607 kOsAll, | |
| 608 SINGLE_VALUE_TYPE(ash::switches::kDisableAshUberTray), | |
| 609 }, | |
| 610 { | |
| 611 "enable-ash-oak", | 604 "enable-ash-oak", |
| 612 IDS_FLAGS_ENABLE_ASH_OAK_NAME, | 605 IDS_FLAGS_ENABLE_ASH_OAK_NAME, |
| 613 IDS_FLAGS_ENABLE_ASH_OAK_DESCRIPTION, | 606 IDS_FLAGS_ENABLE_ASH_OAK_DESCRIPTION, |
| 614 kOsAll, | 607 kOsAll, |
| 615 SINGLE_VALUE_TYPE(ash::switches::kAshEnableOak), | 608 SINGLE_VALUE_TYPE(ash::switches::kAshEnableOak), |
| 616 }, | 609 }, |
| 617 #endif | 610 #endif |
| 618 { | 611 { |
| 619 "enable-devtools-experiments", | 612 "enable-devtools-experiments", |
| 620 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, | 613 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1073 } | 1066 } |
| 1074 | 1067 |
| 1075 const Experiment* GetExperiments(size_t* count) { | 1068 const Experiment* GetExperiments(size_t* count) { |
| 1076 *count = num_experiments; | 1069 *count = num_experiments; |
| 1077 return experiments; | 1070 return experiments; |
| 1078 } | 1071 } |
| 1079 | 1072 |
| 1080 } // namespace testing | 1073 } // namespace testing |
| 1081 | 1074 |
| 1082 } // namespace about_flags | 1075 } // namespace about_flags |
| OLD | NEW |