| 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 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1507 #if defined(OS_CHROMEOS) | 1507 #if defined(OS_CHROMEOS) |
| 1508 { | 1508 { |
| 1509 "enable-first-run-ui-transitions", | 1509 "enable-first-run-ui-transitions", |
| 1510 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, | 1510 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, |
| 1511 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, | 1511 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, |
| 1512 kOsCrOS, | 1512 kOsCrOS, |
| 1513 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) | 1513 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) |
| 1514 }, | 1514 }, |
| 1515 #endif | 1515 #endif |
| 1516 { | 1516 { |
| 1517 "disable-new-bookmark-apps", | 1517 "enable-new-bookmark-apps", |
| 1518 IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_NAME, | 1518 IDS_FLAGS_ENABLE_NEW_BOOKMARK_APPS_NAME, |
| 1519 IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_DESCRIPTION, | 1519 IDS_FLAGS_ENABLE_NEW_BOOKMARK_APPS_DESCRIPTION, |
| 1520 kOsWin | kOsCrOS | kOsLinux | kOsMac, | 1520 kOsWin | kOsCrOS | kOsLinux | kOsMac, |
| 1521 SINGLE_VALUE_TYPE(switches::kDisableNewBookmarkApps) | 1521 SINGLE_VALUE_TYPE(switches::kEnableNewBookmarkApps) |
| 1522 }, | 1522 }, |
| 1523 #if defined(OS_MACOSX) | 1523 #if defined(OS_MACOSX) |
| 1524 { | 1524 { |
| 1525 "enable-hosted-app-shim-creation", | 1525 "enable-hosted-app-shim-creation", |
| 1526 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_NAME, | 1526 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_NAME, |
| 1527 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, | 1527 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, |
| 1528 kOsMac, | 1528 kOsMac, |
| 1529 SINGLE_VALUE_TYPE(switches::kEnableHostedAppShimCreation) | 1529 SINGLE_VALUE_TYPE(switches::kEnableHostedAppShimCreation) |
| 1530 }, | 1530 }, |
| 1531 { | 1531 { |
| (...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2684 } | 2684 } |
| 2685 | 2685 |
| 2686 const Experiment* GetExperiments(size_t* count) { | 2686 const Experiment* GetExperiments(size_t* count) { |
| 2687 *count = num_experiments; | 2687 *count = num_experiments; |
| 2688 return experiments; | 2688 return experiments; |
| 2689 } | 2689 } |
| 2690 | 2690 |
| 2691 } // namespace testing | 2691 } // namespace testing |
| 2692 | 2692 |
| 2693 } // namespace about_flags | 2693 } // namespace about_flags |
| OLD | NEW |