| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 #include "chrome/browser/android/chrome_feature_list.h" | 81 #include "chrome/browser/android/chrome_feature_list.h" |
| 82 #else | 82 #else |
| 83 #include "ui/message_center/message_center_switches.h" | 83 #include "ui/message_center/message_center_switches.h" |
| 84 #endif | 84 #endif |
| 85 | 85 |
| 86 #if defined(OS_CHROMEOS) | 86 #if defined(OS_CHROMEOS) |
| 87 #include "chromeos/chromeos_switches.h" | 87 #include "chromeos/chromeos_switches.h" |
| 88 #include "third_party/cros_system_api/switches/chrome_switches.h" | 88 #include "third_party/cros_system_api/switches/chrome_switches.h" |
| 89 #endif | 89 #endif |
| 90 | 90 |
| 91 #if defined(OS_MACOSX) |
| 92 #include "chrome/browser/ui/browser_dialogs.h" |
| 93 #endif |
| 94 |
| 91 #if defined(ENABLE_APP_LIST) | 95 #if defined(ENABLE_APP_LIST) |
| 92 #include "ui/app_list/app_list_switches.h" | 96 #include "ui/app_list/app_list_switches.h" |
| 93 #endif | 97 #endif |
| 94 | 98 |
| 95 #if defined(ENABLE_EXTENSIONS) | 99 #if defined(ENABLE_EXTENSIONS) |
| 96 #include "extensions/common/switches.h" | 100 #include "extensions/common/switches.h" |
| 97 #endif | 101 #endif |
| 98 | 102 |
| 99 #if defined(ENABLE_PRINT_PREVIEW) | 103 #if defined(ENABLE_PRINT_PREVIEW) |
| 100 #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h" | 104 #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h" |
| (...skipping 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1569 switches::kDisableAppInfoDialogMac)}, | 1573 switches::kDisableAppInfoDialogMac)}, |
| 1570 {"mac-views-native-app-windows", | 1574 {"mac-views-native-app-windows", |
| 1571 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, | 1575 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, |
| 1572 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, | 1576 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, |
| 1573 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, | 1577 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, |
| 1574 switches::kDisableMacViewsNativeAppWindows)}, | 1578 switches::kDisableMacViewsNativeAppWindows)}, |
| 1575 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, | 1579 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, |
| 1576 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, | 1580 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, |
| 1577 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, | 1581 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, |
| 1578 switches::kDisableAppWindowCycling)}, | 1582 switches::kDisableAppWindowCycling)}, |
| 1579 {"mac-views-dialogs", IDS_FLAGS_MAC_VIEWS_DIALOGS_NAME, | 1583 {"mac-views-native-dialogs", IDS_FLAGS_MAC_VIEWS_NATIVE_DIALOGS_NAME, |
| 1580 IDS_FLAGS_MAC_VIEWS_DIALOGS_DESCRIPTION, kOsMac, | 1584 IDS_FLAGS_MAC_VIEWS_NATIVE_DIALOGS_DESCRIPTION, kOsMac, |
| 1581 SINGLE_VALUE_TYPE(switches::kEnableMacViewsDialogs)}, | 1585 FEATURE_VALUE_TYPE(chrome::kMacViewsNativeDialogs)}, |
| 1586 {"mac-views-webui-dialogs", IDS_FLAGS_MAC_VIEWS_WEBUI_DIALOGS_NAME, |
| 1587 IDS_FLAGS_MAC_VIEWS_WEBUI_DIALOGS_DESCRIPTION, kOsMac, |
| 1588 FEATURE_VALUE_TYPE(chrome::kMacViewsWebUIDialogs)}, |
| 1582 #endif | 1589 #endif |
| 1583 #if defined(ENABLE_WEBVR) | 1590 #if defined(ENABLE_WEBVR) |
| 1584 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, | 1591 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, |
| 1585 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, | 1592 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, |
| 1586 #endif | 1593 #endif |
| 1587 #if defined(OS_CHROMEOS) | 1594 #if defined(OS_CHROMEOS) |
| 1588 {"disable-accelerated-mjpeg-decode", | 1595 {"disable-accelerated-mjpeg-decode", |
| 1589 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME, | 1596 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME, |
| 1590 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS, | 1597 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS, |
| 1591 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, | 1598 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, |
| (...skipping 494 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 |