| 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 <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1518 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, | 1518 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, |
| 1519 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, | 1519 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, |
| 1520 kOsCrOS, | 1520 kOsCrOS, |
| 1521 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) | 1521 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) |
| 1522 }, | 1522 }, |
| 1523 #endif | 1523 #endif |
| 1524 { | 1524 { |
| 1525 "enable-streamlined-hosted-apps", | 1525 "enable-streamlined-hosted-apps", |
| 1526 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME, | 1526 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME, |
| 1527 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_DESCRIPTION, | 1527 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_DESCRIPTION, |
| 1528 kOsWin | kOsCrOS | kOsLinux, | 1528 kOsWin | kOsCrOS | kOsLinux | kOsMac, |
| 1529 SINGLE_VALUE_TYPE(switches::kEnableStreamlinedHostedApps) | 1529 SINGLE_VALUE_TYPE(switches::kEnableStreamlinedHostedApps) |
| 1530 }, | 1530 }, |
| 1531 { | 1531 { |
| 1532 "enable-ephemeral-apps", | 1532 "enable-ephemeral-apps", |
| 1533 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_NAME, | 1533 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_NAME, |
| 1534 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_DESCRIPTION, | 1534 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_DESCRIPTION, |
| 1535 kOsAll, | 1535 kOsAll, |
| 1536 SINGLE_VALUE_TYPE(switches::kEnableEphemeralApps) | 1536 SINGLE_VALUE_TYPE(switches::kEnableEphemeralApps) |
| 1537 }, | 1537 }, |
| 1538 { | 1538 { |
| (...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2603 } | 2603 } |
| 2604 | 2604 |
| 2605 const Experiment* GetExperiments(size_t* count) { | 2605 const Experiment* GetExperiments(size_t* count) { |
| 2606 *count = num_experiments; | 2606 *count = num_experiments; |
| 2607 return experiments; | 2607 return experiments; |
| 2608 } | 2608 } |
| 2609 | 2609 |
| 2610 } // namespace testing | 2610 } // namespace testing |
| 2611 | 2611 |
| 2612 } // namespace about_flags | 2612 } // namespace about_flags |
| OLD | NEW |