| 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 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1519 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) | 1519 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) |
| 1520 }, | 1520 }, |
| 1521 #endif | 1521 #endif |
| 1522 { | 1522 { |
| 1523 "enable-streamlined-hosted-apps", | 1523 "enable-streamlined-hosted-apps", |
| 1524 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME, | 1524 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME, |
| 1525 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_DESCRIPTION, | 1525 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_DESCRIPTION, |
| 1526 kOsWin | kOsCrOS | kOsLinux | kOsMac, | 1526 kOsWin | kOsCrOS | kOsLinux | kOsMac, |
| 1527 SINGLE_VALUE_TYPE(switches::kEnableStreamlinedHostedApps) | 1527 SINGLE_VALUE_TYPE(switches::kEnableStreamlinedHostedApps) |
| 1528 }, | 1528 }, |
| 1529 #if defined(OS_MACOSX) |
| 1530 { |
| 1531 "enable-hosted-app-shim-creation", |
| 1532 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_NAME, |
| 1533 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, |
| 1534 kOsMac, |
| 1535 SINGLE_VALUE_TYPE(switches::kEnableHostedAppShimCreation) |
| 1536 }, |
| 1537 #endif |
| 1529 { | 1538 { |
| 1530 "enable-ephemeral-apps-in-webstore", | 1539 "enable-ephemeral-apps-in-webstore", |
| 1531 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_NAME, | 1540 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_NAME, |
| 1532 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_DESCRIPTION, | 1541 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_DESCRIPTION, |
| 1533 kOsAll, | 1542 kOsAll, |
| 1534 SINGLE_VALUE_TYPE(switches::kEnableEphemeralAppsInWebstore) | 1543 SINGLE_VALUE_TYPE(switches::kEnableEphemeralAppsInWebstore) |
| 1535 }, | 1544 }, |
| 1536 { | 1545 { |
| 1537 "enable-linkable-ephemeral-apps", | 1546 "enable-linkable-ephemeral-apps", |
| 1538 IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_NAME, | 1547 IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_NAME, |
| (...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2642 } | 2651 } |
| 2643 | 2652 |
| 2644 const Experiment* GetExperiments(size_t* count) { | 2653 const Experiment* GetExperiments(size_t* count) { |
| 2645 *count = num_experiments; | 2654 *count = num_experiments; |
| 2646 return experiments; | 2655 return experiments; |
| 2647 } | 2656 } |
| 2648 | 2657 |
| 2649 } // namespace testing | 2658 } // namespace testing |
| 2650 | 2659 |
| 2651 } // namespace about_flags | 2660 } // namespace about_flags |
| OLD | NEW |