| 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 1467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1478 kOsCrOS, | 1478 kOsCrOS, |
| 1479 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)}, | 1479 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)}, |
| 1480 #endif | 1480 #endif |
| 1481 {"disable-new-bookmark-apps", | 1481 {"disable-new-bookmark-apps", |
| 1482 IDS_FLAGS_NEW_BOOKMARK_APPS_NAME, | 1482 IDS_FLAGS_NEW_BOOKMARK_APPS_NAME, |
| 1483 IDS_FLAGS_NEW_BOOKMARK_APPS_DESCRIPTION, | 1483 IDS_FLAGS_NEW_BOOKMARK_APPS_DESCRIPTION, |
| 1484 kOsWin | kOsCrOS | kOsLinux | kOsMac, | 1484 kOsWin | kOsCrOS | kOsLinux | kOsMac, |
| 1485 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewBookmarkApps, | 1485 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewBookmarkApps, |
| 1486 switches::kDisableNewBookmarkApps)}, | 1486 switches::kDisableNewBookmarkApps)}, |
| 1487 #if defined(OS_MACOSX) | 1487 #if defined(OS_MACOSX) |
| 1488 {"disable-hosted-apps-in-windows", |
| 1489 IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_NAME, |
| 1490 IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_DESCRIPTION, |
| 1491 kOsMac, |
| 1492 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHostedAppsInWindows, |
| 1493 switches::kDisableHostedAppsInWindows)}, |
| 1488 {"disable-hosted-app-shim-creation", | 1494 {"disable-hosted-app-shim-creation", |
| 1489 IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_NAME, | 1495 IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_NAME, |
| 1490 IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, | 1496 IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, |
| 1491 kOsMac, | 1497 kOsMac, |
| 1492 SINGLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation)}, | 1498 SINGLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation)}, |
| 1493 {"enable-hosted-app-quit-notification", | 1499 {"enable-hosted-app-quit-notification", |
| 1494 IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_NAME, | 1500 IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_NAME, |
| 1495 IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_DESCRIPTION, | 1501 IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_DESCRIPTION, |
| 1496 kOsMac, | 1502 kOsMac, |
| 1497 SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, | 1503 SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, |
| (...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2778 } | 2784 } |
| 2779 | 2785 |
| 2780 const Experiment* GetExperiments(size_t* count) { | 2786 const Experiment* GetExperiments(size_t* count) { |
| 2781 *count = num_experiments; | 2787 *count = num_experiments; |
| 2782 return experiments; | 2788 return experiments; |
| 2783 } | 2789 } |
| 2784 | 2790 |
| 2785 } // namespace testing | 2791 } // namespace testing |
| 2786 | 2792 |
| 2787 } // namespace about_flags | 2793 } // namespace about_flags |
| OLD | NEW |