Chromium Code Reviews| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 #include "components/security_state/core/security_state.h" | 61 #include "components/security_state/core/security_state.h" |
| 62 #include "components/security_state/core/switches.h" | 62 #include "components/security_state/core/switches.h" |
| 63 #include "components/signin/core/common/signin_switches.h" | 63 #include "components/signin/core/common/signin_switches.h" |
| 64 #include "components/spellcheck/common/spellcheck_features.h" | 64 #include "components/spellcheck/common/spellcheck_features.h" |
| 65 #include "components/spellcheck/common/spellcheck_switches.h" | 65 #include "components/spellcheck/common/spellcheck_switches.h" |
| 66 #include "components/spellcheck/spellcheck_build_features.h" | 66 #include "components/spellcheck/spellcheck_build_features.h" |
| 67 #include "components/ssl_config/ssl_config_switches.h" | 67 #include "components/ssl_config/ssl_config_switches.h" |
| 68 #include "components/strings/grit/components_strings.h" | 68 #include "components/strings/grit/components_strings.h" |
| 69 #include "components/sync/driver/sync_driver_switches.h" | 69 #include "components/sync/driver/sync_driver_switches.h" |
| 70 #include "components/tracing/common/tracing_switches.h" | 70 #include "components/tracing/common/tracing_switches.h" |
| 71 #include "components/translate/core/browser/translate_infobar_delegate.h" | |
| 71 #include "components/translate/core/browser/translate_manager.h" | 72 #include "components/translate/core/browser/translate_manager.h" |
| 72 #include "components/translate/core/browser/translate_prefs.h" | 73 #include "components/translate/core/browser/translate_prefs.h" |
| 73 #include "components/version_info/version_info.h" | 74 #include "components/version_info/version_info.h" |
| 74 #include "content/public/common/content_features.h" | 75 #include "content/public/common/content_features.h" |
| 75 #include "content/public/common/content_switches.h" | 76 #include "content/public/common/content_switches.h" |
| 76 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h" | 77 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h" |
| 77 #include "content/public/common/features.h" | 78 #include "content/public/common/features.h" |
| 78 #include "device/base/features.h" | 79 #include "device/base/features.h" |
| 79 #include "device/vr/features/features.h" | 80 #include "device/vr/features/features.h" |
| 80 #include "extensions/features/features.h" | 81 #include "extensions/features/features.h" |
| (...skipping 1497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1578 flag_descriptions::kHostedAppQuitNotificationName, | 1579 flag_descriptions::kHostedAppQuitNotificationName, |
| 1579 flag_descriptions::kHostedAppQuitNotificationDescription, kOsMac, | 1580 flag_descriptions::kHostedAppQuitNotificationDescription, kOsMac, |
| 1580 SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, | 1581 SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, |
| 1581 #endif // OS_MACOSX | 1582 #endif // OS_MACOSX |
| 1582 #if defined(OS_ANDROID) | 1583 #if defined(OS_ANDROID) |
| 1583 {"disable-pull-to-refresh-effect", | 1584 {"disable-pull-to-refresh-effect", |
| 1584 flag_descriptions::kPullToRefreshEffectName, | 1585 flag_descriptions::kPullToRefreshEffectName, |
| 1585 flag_descriptions::kPullToRefreshEffectDescription, kOsAndroid, | 1586 flag_descriptions::kPullToRefreshEffectDescription, kOsAndroid, |
| 1586 SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, | 1587 SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)}, |
| 1587 #endif // OS_ANDROID | 1588 #endif // OS_ANDROID |
| 1589 #if defined(OS_ANDROID) | |
|
gone
2017/05/04 01:37:07
can you just combine this OS_ANDROID block with th
Leo
2017/05/05 02:27:54
Done.
| |
| 1590 {"translate-compact-infobar", flag_descriptions::kTranslateCompactUIName, | |
| 1591 flag_descriptions::kTranslateCompactUIDescription, kOsAndroid, | |
| 1592 FEATURE_VALUE_TYPE(translate::kTranslateCompactUI)}, | |
| 1593 #endif // OS_ANDROID | |
| 1588 #if defined(OS_MACOSX) | 1594 #if defined(OS_MACOSX) |
| 1589 {"enable-translate-new-ux", flag_descriptions::kTranslateNewUxName, | 1595 {"enable-translate-new-ux", flag_descriptions::kTranslateNewUxName, |
| 1590 flag_descriptions::kTranslateNewUxDescription, kOsMac, | 1596 flag_descriptions::kTranslateNewUxDescription, kOsMac, |
| 1591 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, | 1597 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, |
| 1592 switches::kDisableTranslateNewUX)}, | 1598 switches::kDisableTranslateNewUX)}, |
| 1593 #endif // OS_MACOSX | 1599 #endif // OS_MACOSX |
| 1594 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 1600 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
| 1595 {"translate-2016q2-ui", flag_descriptions::kTranslate2016q2UiName, | 1601 {"translate-2016q2-ui", flag_descriptions::kTranslate2016q2UiName, |
| 1596 flag_descriptions::kTranslate2016q2UiDescription, | 1602 flag_descriptions::kTranslate2016q2UiDescription, |
| 1597 kOsCrOS | kOsWin | kOsLinux, | 1603 kOsCrOS | kOsWin | kOsLinux, |
| (...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2977 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2983 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2978 | 2984 |
| 2979 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2985 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2980 *count = arraysize(kFeatureEntries); | 2986 *count = arraysize(kFeatureEntries); |
| 2981 return kFeatureEntries; | 2987 return kFeatureEntries; |
| 2982 } | 2988 } |
| 2983 | 2989 |
| 2984 } // namespace testing | 2990 } // namespace testing |
| 2985 | 2991 |
| 2986 } // namespace about_flags | 2992 } // namespace about_flags |
| OLD | NEW |