| 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 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1578 switches::kDisableAppInfoDialogMac)}, | 1578 switches::kDisableAppInfoDialogMac)}, |
| 1579 {"mac-views-native-app-windows", | 1579 {"mac-views-native-app-windows", |
| 1580 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, | 1580 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, |
| 1581 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, | 1581 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, |
| 1582 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, | 1582 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, |
| 1583 switches::kDisableMacViewsNativeAppWindows)}, | 1583 switches::kDisableMacViewsNativeAppWindows)}, |
| 1584 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, | 1584 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, |
| 1585 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, | 1585 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, |
| 1586 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, | 1586 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, |
| 1587 switches::kDisableAppWindowCycling)}, | 1587 switches::kDisableAppWindowCycling)}, |
| 1588 {"mac-views-native-dialogs", IDS_FLAGS_MAC_VIEWS_NATIVE_DIALOGS_NAME, | |
| 1589 IDS_FLAGS_MAC_VIEWS_NATIVE_DIALOGS_DESCRIPTION, kOsMac, | |
| 1590 FEATURE_VALUE_TYPE(chrome::kMacViewsNativeDialogs)}, | |
| 1591 {"mac-views-webui-dialogs", IDS_FLAGS_MAC_VIEWS_WEBUI_DIALOGS_NAME, | |
| 1592 IDS_FLAGS_MAC_VIEWS_WEBUI_DIALOGS_DESCRIPTION, kOsMac, | |
| 1593 FEATURE_VALUE_TYPE(chrome::kMacViewsWebUIDialogs)}, | |
| 1594 #endif // OS_MACOSX | 1588 #endif // OS_MACOSX |
| 1595 #if defined(ENABLE_WEBVR) | 1589 #if defined(ENABLE_WEBVR) |
| 1596 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, | 1590 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, |
| 1597 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, | 1591 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, |
| 1598 #endif // ENABLE_WEBVR | 1592 #endif // ENABLE_WEBVR |
| 1599 #if defined(ENABLE_VR_SHELL) | 1593 #if defined(ENABLE_VR_SHELL) |
| 1600 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, | 1594 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, |
| 1601 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, | 1595 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, |
| 1602 FEATURE_VALUE_TYPE(features::kVrShell)}, | 1596 FEATURE_VALUE_TYPE(features::kVrShell)}, |
| 1603 #endif // ENABLE_VR_SHELL | 1597 #endif // ENABLE_VR_SHELL |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2309 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2303 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2310 | 2304 |
| 2311 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2305 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2312 *count = arraysize(kFeatureEntries); | 2306 *count = arraysize(kFeatureEntries); |
| 2313 return kFeatureEntries; | 2307 return kFeatureEntries; |
| 2314 } | 2308 } |
| 2315 | 2309 |
| 2316 } // namespace testing | 2310 } // namespace testing |
| 2317 | 2311 |
| 2318 } // namespace about_flags | 2312 } // namespace about_flags |
| OLD | NEW |