| 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 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1528 #if defined(OS_CHROMEOS) | 1528 #if defined(OS_CHROMEOS) |
| 1529 { | 1529 { |
| 1530 "enable-first-run-ui-transitions", | 1530 "enable-first-run-ui-transitions", |
| 1531 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, | 1531 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, |
| 1532 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, | 1532 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, |
| 1533 kOsCrOS, | 1533 kOsCrOS, |
| 1534 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) | 1534 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) |
| 1535 }, | 1535 }, |
| 1536 #endif | 1536 #endif |
| 1537 { | 1537 { |
| 1538 "enable-streamlined-hosted-apps", | 1538 "disable-new-bookmark-apps", |
| 1539 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME, | 1539 IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_NAME, |
| 1540 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_DESCRIPTION, | 1540 IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_DESCRIPTION, |
| 1541 kOsWin | kOsCrOS | kOsLinux | kOsMac, | 1541 kOsWin | kOsCrOS | kOsLinux | kOsMac, |
| 1542 SINGLE_VALUE_TYPE(switches::kEnableStreamlinedHostedApps) | 1542 SINGLE_VALUE_TYPE(switches::kDisableNewBookmarkApps) |
| 1543 }, | 1543 }, |
| 1544 { | 1544 { |
| 1545 "enable-ephemeral-apps-in-webstore", | 1545 "enable-ephemeral-apps-in-webstore", |
| 1546 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_NAME, | 1546 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_NAME, |
| 1547 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_DESCRIPTION, | 1547 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_IN_WEBSTORE_DESCRIPTION, |
| 1548 kOsAll, | 1548 kOsAll, |
| 1549 SINGLE_VALUE_TYPE(switches::kEnableEphemeralAppsInWebstore) | 1549 SINGLE_VALUE_TYPE(switches::kEnableEphemeralAppsInWebstore) |
| 1550 }, | 1550 }, |
| 1551 { | 1551 { |
| 1552 "enable-linkable-ephemeral-apps", | 1552 "enable-linkable-ephemeral-apps", |
| (...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2650 } | 2650 } |
| 2651 | 2651 |
| 2652 const Experiment* GetExperiments(size_t* count) { | 2652 const Experiment* GetExperiments(size_t* count) { |
| 2653 *count = num_experiments; | 2653 *count = num_experiments; |
| 2654 return experiments; | 2654 return experiments; |
| 2655 } | 2655 } |
| 2656 | 2656 |
| 2657 } // namespace testing | 2657 } // namespace testing |
| 2658 | 2658 |
| 2659 } // namespace about_flags | 2659 } // namespace about_flags |
| OLD | NEW |