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 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 SINGLE_VALUE_TYPE(switches::kEnableNTPOtherSessionsMenu) | 560 SINGLE_VALUE_TYPE(switches::kEnableNTPOtherSessionsMenu) |
561 }, | 561 }, |
562 #if defined(USE_AURA) | 562 #if defined(USE_AURA) |
563 { | 563 { |
564 "enable-ash-uber-tray", | 564 "enable-ash-uber-tray", |
565 IDS_FLAGS_ENABLE_ASH_UBER_TRAY_NAME, | 565 IDS_FLAGS_ENABLE_ASH_UBER_TRAY_NAME, |
566 IDS_FLAGS_ENABLE_ASH_UBER_TRAY_DESCRIPTION, | 566 IDS_FLAGS_ENABLE_ASH_UBER_TRAY_DESCRIPTION, |
567 kOsAll, | 567 kOsAll, |
568 SINGLE_VALUE_TYPE(ash::switches::kAshUberTray), | 568 SINGLE_VALUE_TYPE(ash::switches::kAshUberTray), |
569 }, | 569 }, |
| 570 { |
| 571 "enable-ash-oak", |
| 572 IDS_FLAGS_ENABLE_ASH_OAK_NAME, |
| 573 IDS_FLAGS_ENABLE_ASH_OAK_DESCRIPTION, |
| 574 kOsAll, |
| 575 SINGLE_VALUE_TYPE(ash::switches::kAshEnableOak), |
| 576 }, |
570 #endif | 577 #endif |
571 { | 578 { |
572 "enable-devtools-experiments", | 579 "enable-devtools-experiments", |
573 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, | 580 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME, |
574 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION, | 581 IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION, |
575 kOsAll, | 582 kOsAll, |
576 SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments) | 583 SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments) |
577 }, | 584 }, |
578 { | 585 { |
579 "enable-suggestions-ntp", | 586 "enable-suggestions-ntp", |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1010 } | 1017 } |
1011 | 1018 |
1012 const Experiment* GetExperiments(size_t* count) { | 1019 const Experiment* GetExperiments(size_t* count) { |
1013 *count = num_experiments; | 1020 *count = num_experiments; |
1014 return experiments; | 1021 return experiments; |
1015 } | 1022 } |
1016 | 1023 |
1017 } // namespace testing | 1024 } // namespace testing |
1018 | 1025 |
1019 } // namespace about_flags | 1026 } // namespace about_flags |
OLD | NEW |