| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 #if defined(OS_CHROMEOS) | 85 #if defined(OS_CHROMEOS) |
| 86 #include "chromeos/chromeos_switches.h" | 86 #include "chromeos/chromeos_switches.h" |
| 87 #include "third_party/cros_system_api/switches/chrome_switches.h" | 87 #include "third_party/cros_system_api/switches/chrome_switches.h" |
| 88 #endif | 88 #endif |
| 89 | 89 |
| 90 #if defined(OS_WIN) | 90 #if defined(OS_WIN) |
| 91 #include "components/search_engines/desktop_search_utils.h" | 91 #include "components/search_engines/desktop_search_utils.h" |
| 92 #endif // defined(OS_WIN) | 92 #endif // defined(OS_WIN) |
| 93 | 93 |
| 94 #if defined(OS_MACOSX) |
| 95 #include "chrome/browser/ui/browser_dialogs.h" |
| 96 #endif |
| 97 |
| 94 #if defined(ENABLE_APP_LIST) | 98 #if defined(ENABLE_APP_LIST) |
| 95 #include "ui/app_list/app_list_switches.h" | 99 #include "ui/app_list/app_list_switches.h" |
| 96 #endif | 100 #endif |
| 97 | 101 |
| 98 #if defined(ENABLE_EXTENSIONS) | 102 #if defined(ENABLE_EXTENSIONS) |
| 99 #include "extensions/common/switches.h" | 103 #include "extensions/common/switches.h" |
| 100 #endif | 104 #endif |
| 101 | 105 |
| 102 #if defined(ENABLE_PRINT_PREVIEW) | 106 #if defined(ENABLE_PRINT_PREVIEW) |
| 103 #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h" | 107 #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h" |
| (...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1556 switches::kDisableAppInfoDialogMac)}, | 1560 switches::kDisableAppInfoDialogMac)}, |
| 1557 {"mac-views-native-app-windows", | 1561 {"mac-views-native-app-windows", |
| 1558 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, | 1562 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, |
| 1559 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, | 1563 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, |
| 1560 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, | 1564 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, |
| 1561 switches::kDisableMacViewsNativeAppWindows)}, | 1565 switches::kDisableMacViewsNativeAppWindows)}, |
| 1562 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, | 1566 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, |
| 1563 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, | 1567 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, |
| 1564 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, | 1568 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, |
| 1565 switches::kDisableAppWindowCycling)}, | 1569 switches::kDisableAppWindowCycling)}, |
| 1566 {"mac-views-dialogs", IDS_FLAGS_MAC_VIEWS_DIALOGS_NAME, | 1570 {"mac-views-dialogs-phase3", IDS_FLAGS_MAC_VIEWS_DIALOGS_NAME, |
| 1567 IDS_FLAGS_MAC_VIEWS_DIALOGS_DESCRIPTION, kOsMac, | 1571 IDS_FLAGS_MAC_VIEWS_DIALOGS_DESCRIPTION, kOsMac, |
| 1568 SINGLE_VALUE_TYPE(switches::kEnableMacViewsDialogs)}, | 1572 SINGLE_VALUE_TYPE(switches::kEnableMacViewsDialogs)}, |
| 1573 {"mac-views-dialogs-phase2", IDS_FLAGS_MAC_VIEWS_DIALOGS_PHASE2_NAME, |
| 1574 IDS_FLAGS_MAC_VIEWS_DIALOGS_PHASE2_DESCRIPTION, kOsMac, |
| 1575 FEATURE_VALUE_TYPE(chrome::kMacViewsWebUIDialogs)}, |
| 1569 #endif | 1576 #endif |
| 1570 #if defined(ENABLE_WEBVR) | 1577 #if defined(ENABLE_WEBVR) |
| 1571 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, | 1578 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, |
| 1572 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, | 1579 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, |
| 1573 #endif | 1580 #endif |
| 1574 #if defined(OS_CHROMEOS) | 1581 #if defined(OS_CHROMEOS) |
| 1575 {"disable-accelerated-mjpeg-decode", | 1582 {"disable-accelerated-mjpeg-decode", |
| 1576 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME, | 1583 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME, |
| 1577 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS, | 1584 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS, |
| 1578 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, | 1585 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2086 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2093 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2087 | 2094 |
| 2088 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2095 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2089 *count = arraysize(kFeatureEntries); | 2096 *count = arraysize(kFeatureEntries); |
| 2090 return kFeatureEntries; | 2097 return kFeatureEntries; |
| 2091 } | 2098 } |
| 2092 | 2099 |
| 2093 } // namespace testing | 2100 } // namespace testing |
| 2094 | 2101 |
| 2095 } // namespace about_flags | 2102 } // namespace about_flags |
| OLD | NEW |