Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2346283002: Fix build with media_use_ffmpeg=false (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/utility/media_galleries/media_metadata_parser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1911 matching lines...) Expand 10 before | Expand all | Expand 10 after
1922 FEATURE_VALUE_TYPE(ntp_snippets::kDownloadSuggestionsFeature)}, 1922 FEATURE_VALUE_TYPE(ntp_snippets::kDownloadSuggestionsFeature)},
1923 {"enable-ntp-bookmark-suggestions", 1923 {"enable-ntp-bookmark-suggestions",
1924 IDS_FLAGS_ENABLE_NTP_BOOKMARK_SUGGESTIONS_NAME, 1924 IDS_FLAGS_ENABLE_NTP_BOOKMARK_SUGGESTIONS_NAME,
1925 IDS_FLAGS_ENABLE_NTP_BOOKMARK_SUGGESTIONS_DESCRIPTION, kOsAndroid, 1925 IDS_FLAGS_ENABLE_NTP_BOOKMARK_SUGGESTIONS_DESCRIPTION, kOsAndroid,
1926 FEATURE_VALUE_TYPE(ntp_snippets::kBookmarkSuggestionsFeature)}, 1926 FEATURE_VALUE_TYPE(ntp_snippets::kBookmarkSuggestionsFeature)},
1927 {"enable-ntp-physical-web-page-suggestions", 1927 {"enable-ntp-physical-web-page-suggestions",
1928 IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_NAME, 1928 IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_NAME,
1929 IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid, 1929 IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid,
1930 FEATURE_VALUE_TYPE(ntp_snippets::kPhysicalWebPageSuggestionsFeature)}, 1930 FEATURE_VALUE_TYPE(ntp_snippets::kPhysicalWebPageSuggestionsFeature)},
1931 #endif // defined(OS_ANDROID) 1931 #endif // defined(OS_ANDROID)
1932 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1932 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \
1933 !defined(MEDIA_DISABLE_FFMPEG)
1933 {"enable-webrtc-h264-with-openh264-ffmpeg", 1934 {"enable-webrtc-h264-with-openh264-ffmpeg",
1934 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, 1935 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
1935 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop, 1936 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
1936 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, 1937 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)},
1937 #endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1938 #endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) &&
1939 // !defined(MEDIA_DISABLE_FFMPEG)
1938 #if defined(OS_ANDROID) 1940 #if defined(OS_ANDROID)
1939 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION, 1941 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION,
1940 kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)}, 1942 kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)},
1941 #endif // defined(OS_ANDROID) 1943 #endif // defined(OS_ANDROID)
1942 #if defined(OS_ANDROID) 1944 #if defined(OS_ANDROID)
1943 {"offline-pages-ntp", IDS_FLAGS_NTP_OFFLINE_PAGES_NAME, 1945 {"offline-pages-ntp", IDS_FLAGS_NTP_OFFLINE_PAGES_NAME,
1944 IDS_FLAGS_NTP_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, 1946 IDS_FLAGS_NTP_OFFLINE_PAGES_DESCRIPTION, kOsAndroid,
1945 FEATURE_VALUE_TYPE(chrome::android::kNTPOfflinePagesFeature)}, 1947 FEATURE_VALUE_TYPE(chrome::android::kNTPOfflinePagesFeature)},
1946 {"offlining-recent-pages", IDS_FLAGS_OFFLINING_RECENT_PAGES_NAME, 1948 {"offlining-recent-pages", IDS_FLAGS_OFFLINING_RECENT_PAGES_NAME,
1947 IDS_FLAGS_OFFLINING_RECENT_PAGES_DESCRIPTION, kOsAndroid, 1949 IDS_FLAGS_OFFLINING_RECENT_PAGES_DESCRIPTION, kOsAndroid,
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
2279 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2281 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2280 2282
2281 const FeatureEntry* GetFeatureEntries(size_t* count) { 2283 const FeatureEntry* GetFeatureEntries(size_t* count) {
2282 *count = arraysize(kFeatureEntries); 2284 *count = arraysize(kFeatureEntries);
2283 return kFeatureEntries; 2285 return kFeatureEntries;
2284 } 2286 }
2285 2287
2286 } // namespace testing 2288 } // namespace testing
2287 2289
2288 } // namespace about_flags 2290 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/utility/media_galleries/media_metadata_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698