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 1519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1530 { | 1530 { |
1531 "enable-first-run-ui-transitions", | 1531 "enable-first-run-ui-transitions", |
1532 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, | 1532 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, |
1533 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, | 1533 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, |
1534 kOsCrOS, | 1534 kOsCrOS, |
1535 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) | 1535 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) |
1536 }, | 1536 }, |
1537 #endif | 1537 #endif |
1538 { | 1538 { |
1539 "disable-new-bookmark-apps", | 1539 "disable-new-bookmark-apps", |
1540 IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_NAME, | 1540 IDS_FLAGS_NEW_BOOKMARK_APPS_NAME, |
1541 IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_DESCRIPTION, | 1541 IDS_FLAGS_NEW_BOOKMARK_APPS_DESCRIPTION, |
1542 kOsWin | kOsCrOS | kOsLinux | kOsMac, | 1542 kOsWin | kOsCrOS | kOsLinux | kOsMac, |
1543 SINGLE_VALUE_TYPE(switches::kDisableNewBookmarkApps) | 1543 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewBookmarkApps, |
| 1544 switches::kDisableNewBookmarkApps) |
1544 }, | 1545 }, |
1545 #if defined(OS_MACOSX) | 1546 #if defined(OS_MACOSX) |
1546 { | 1547 { |
1547 "disable-hosted-app-shim-creation", | 1548 "disable-hosted-app-shim-creation", |
1548 IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_NAME, | 1549 IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_NAME, |
1549 IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, | 1550 IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, |
1550 kOsMac, | 1551 kOsMac, |
1551 SINGLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation) | 1552 SINGLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation) |
1552 }, | 1553 }, |
1553 { | 1554 { |
(...skipping 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2786 } | 2787 } |
2787 | 2788 |
2788 const Experiment* GetExperiments(size_t* count) { | 2789 const Experiment* GetExperiments(size_t* count) { |
2789 *count = num_experiments; | 2790 *count = num_experiments; |
2790 return experiments; | 2791 return experiments; |
2791 } | 2792 } |
2792 | 2793 |
2793 } // namespace testing | 2794 } // namespace testing |
2794 | 2795 |
2795 } // namespace about_flags | 2796 } // namespace about_flags |
OLD | NEW |