| 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 1631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1642 #if defined(OS_MACOSX) | 1642 #if defined(OS_MACOSX) |
| 1643 {"app-info-dialog", IDS_FLAGS_APP_INFO_DIALOG_NAME, | 1643 {"app-info-dialog", IDS_FLAGS_APP_INFO_DIALOG_NAME, |
| 1644 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, kOsMac, | 1644 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, kOsMac, |
| 1645 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, | 1645 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, |
| 1646 switches::kDisableAppInfoDialogMac)}, | 1646 switches::kDisableAppInfoDialogMac)}, |
| 1647 {"mac-views-native-app-windows", | 1647 {"mac-views-native-app-windows", |
| 1648 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, | 1648 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, |
| 1649 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, | 1649 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, |
| 1650 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, | 1650 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, |
| 1651 switches::kDisableMacViewsNativeAppWindows)}, | 1651 switches::kDisableMacViewsNativeAppWindows)}, |
| 1652 {"mac-views-task-manager", IDS_FLAGS_MAC_VIEWS_TASK_MANAGER_NAME, |
| 1653 IDS_FLAGS_MAC_VIEWS_TASK_MANAGER_DESCRIPTION, kOsMac, |
| 1654 FEATURE_VALUE_TYPE(features::kViewsTaskManager)}, |
| 1652 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, | 1655 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, |
| 1653 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, | 1656 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, |
| 1654 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, | 1657 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, |
| 1655 switches::kDisableAppWindowCycling)}, | 1658 switches::kDisableAppWindowCycling)}, |
| 1656 #endif // OS_MACOSX | 1659 #endif // OS_MACOSX |
| 1657 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, | 1660 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, |
| 1658 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, | 1661 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, |
| 1659 #if defined(ENABLE_WEBVR) | 1662 #if defined(ENABLE_WEBVR) |
| 1660 {"enable-webvr-experimental-rendering", | 1663 {"enable-webvr-experimental-rendering", |
| 1661 IDS_FLAGS_WEBVR_EXPERIMENTAL_RENDERING_NAME, | 1664 IDS_FLAGS_WEBVR_EXPERIMENTAL_RENDERING_NAME, |
| (...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2556 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2559 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2557 | 2560 |
| 2558 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2561 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2559 *count = arraysize(kFeatureEntries); | 2562 *count = arraysize(kFeatureEntries); |
| 2560 return kFeatureEntries; | 2563 return kFeatureEntries; |
| 2561 } | 2564 } |
| 2562 | 2565 |
| 2563 } // namespace testing | 2566 } // namespace testing |
| 2564 | 2567 |
| 2565 } // namespace about_flags | 2568 } // namespace about_flags |
| OLD | NEW |