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

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

Issue 2190583002: Add bookmark provider for content suggestions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments #2 Created 4 years, 4 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_feature_list.h » ('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 1864 matching lines...) Expand 10 before | Expand all | Expand 10 after
1875 #if defined(OS_ANDROID) 1875 #if defined(OS_ANDROID)
1876 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, 1876 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
1877 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid, 1877 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid,
1878 FEATURE_WITH_VARIATIONS_VALUE_TYPE(chrome::android::kNTPSnippetsFeature, 1878 FEATURE_WITH_VARIATIONS_VALUE_TYPE(chrome::android::kNTPSnippetsFeature,
1879 kNTPSnippetsFeatureVariations, 1879 kNTPSnippetsFeatureVariations,
1880 ntp_snippets::kStudyName)}, 1880 ntp_snippets::kStudyName)},
1881 {"enable-ntp-offline-page-suggestions", 1881 {"enable-ntp-offline-page-suggestions",
1882 IDS_FLAGS_ENABLE_NTP_OFFLINE_PAGE_SUGGESTIONS_NAME, 1882 IDS_FLAGS_ENABLE_NTP_OFFLINE_PAGE_SUGGESTIONS_NAME,
1883 IDS_FLAGS_ENABLE_NTP_OFFLINE_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid, 1883 IDS_FLAGS_ENABLE_NTP_OFFLINE_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid,
1884 FEATURE_VALUE_TYPE(chrome::android::kNTPOfflinePageSuggestionsFeature)}, 1884 FEATURE_VALUE_TYPE(chrome::android::kNTPOfflinePageSuggestionsFeature)},
1885 {"enable-ntp-bookmark-suggestions",
1886 IDS_FLAGS_ENABLE_NTP_BOOKMARK_SUGGESTIONS_NAME,
1887 IDS_FLAGS_ENABLE_NTP_BOOKMARK_SUGGESTIONS_DESCRIPTION, kOsAndroid,
1888 FEATURE_VALUE_TYPE(chrome::android::kNTPBookmarkSuggestionsFeature)},
1885 #endif // defined(OS_ANDROID) 1889 #endif // defined(OS_ANDROID)
1886 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1890 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
1887 {"enable-webrtc-h264-with-openh264-ffmpeg", 1891 {"enable-webrtc-h264-with-openh264-ffmpeg",
1888 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, 1892 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
1889 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop, 1893 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
1890 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, 1894 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)},
1891 #endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1895 #endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
1892 #if defined(OS_ANDROID) 1896 #if defined(OS_ANDROID)
1893 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION, 1897 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION,
1894 kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)}, 1898 kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)},
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
2211 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2215 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2212 2216
2213 const FeatureEntry* GetFeatureEntries(size_t* count) { 2217 const FeatureEntry* GetFeatureEntries(size_t* count) {
2214 *count = arraysize(kFeatureEntries); 2218 *count = arraysize(kFeatureEntries);
2215 return kFeatureEntries; 2219 return kFeatureEntries;
2216 } 2220 }
2217 2221
2218 } // namespace testing 2222 } // namespace testing
2219 2223
2220 } // namespace about_flags 2224 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/chrome_feature_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698