| 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 2379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2390 {"ntp-condensed-tile-layout", | 2390 {"ntp-condensed-tile-layout", |
| 2391 flag_descriptions::kNtpCondensedTileLayoutName, | 2391 flag_descriptions::kNtpCondensedTileLayoutName, |
| 2392 flag_descriptions::kNtpCondensedTileLayoutDescription, kOsAndroid, | 2392 flag_descriptions::kNtpCondensedTileLayoutDescription, kOsAndroid, |
| 2393 FEATURE_WITH_PARAMS_VALUE_TYPE( | 2393 FEATURE_WITH_PARAMS_VALUE_TYPE( |
| 2394 chrome::android::kNTPCondensedTileLayoutFeature, | 2394 chrome::android::kNTPCondensedTileLayoutFeature, |
| 2395 kNTPCondensedTileLayoutFeatureVariations, | 2395 kNTPCondensedTileLayoutFeatureVariations, |
| 2396 chrome::android::kNTPCondensedTileLayoutFeature.name)}, | 2396 chrome::android::kNTPCondensedTileLayoutFeature.name)}, |
| 2397 {"ntp-google-g-in-omnibox", flag_descriptions::kNtpGoogleGInOmniboxName, | 2397 {"ntp-google-g-in-omnibox", flag_descriptions::kNtpGoogleGInOmniboxName, |
| 2398 flag_descriptions::kNtpGoogleGInOmniboxDescription, kOsAndroid, | 2398 flag_descriptions::kNtpGoogleGInOmniboxDescription, kOsAndroid, |
| 2399 FEATURE_VALUE_TYPE(chrome::android::NTPShowGoogleGInOmniboxFeature)}, | 2399 FEATURE_VALUE_TYPE(chrome::android::NTPShowGoogleGInOmniboxFeature)}, |
| 2400 {"enable-ntp-push-updates", flag_descriptions::kEnableNtpPushUpdatesName, |
| 2401 flag_descriptions::kEnableNtpPushUpdatesDescription, kOsAndroid, |
| 2402 FEATURE_VALUE_TYPE(ntp_snippets::kPushUpdatesFeature)}, |
| 2400 #endif // OS_ANDROID | 2403 #endif // OS_ANDROID |
| 2401 #if BUILDFLAG(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \ | 2404 #if BUILDFLAG(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \ |
| 2402 !defined(MEDIA_DISABLE_FFMPEG) | 2405 !defined(MEDIA_DISABLE_FFMPEG) |
| 2403 {"enable-webrtc-h264-with-openh264-ffmpeg", | 2406 {"enable-webrtc-h264-with-openh264-ffmpeg", |
| 2404 flag_descriptions::kWebrtcH264WithOpenh264FfmpegName, | 2407 flag_descriptions::kWebrtcH264WithOpenh264FfmpegName, |
| 2405 flag_descriptions::kWebrtcH264WithOpenh264FfmpegDescription, kOsDesktop, | 2408 flag_descriptions::kWebrtcH264WithOpenh264FfmpegDescription, kOsDesktop, |
| 2406 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, | 2409 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, |
| 2407 #endif // ENABLE_WEBRTC && BUILDFLAG(RTC_USE_H264) && !MEDIA_DISABLE_FFMPEG | 2410 #endif // ENABLE_WEBRTC && BUILDFLAG(RTC_USE_H264) && !MEDIA_DISABLE_FFMPEG |
| 2408 #if defined(OS_ANDROID) | 2411 #if defined(OS_ANDROID) |
| 2409 {"offline-pages-ntp", flag_descriptions::kNtpOfflinePagesName, | 2412 {"offline-pages-ntp", flag_descriptions::kNtpOfflinePagesName, |
| (...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3218 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3221 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 3219 | 3222 |
| 3220 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3223 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 3221 *count = arraysize(kFeatureEntries); | 3224 *count = arraysize(kFeatureEntries); |
| 3222 return kFeatureEntries; | 3225 return kFeatureEntries; |
| 3223 } | 3226 } |
| 3224 | 3227 |
| 3225 } // namespace testing | 3228 } // namespace testing |
| 3226 | 3229 |
| 3227 } // namespace about_flags | 3230 } // namespace about_flags |
| OLD | NEW |