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

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

Issue 2214683002: [New CL] Add bookmark provider for content suggestions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks
Patch Set: Insert a blank line 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
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 1881 matching lines...) Expand 10 before | Expand all | Expand 10 after
1892 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, 1892 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
1893 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid, 1893 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid,
1894 FEATURE_WITH_VARIATIONS_VALUE_TYPE( 1894 FEATURE_WITH_VARIATIONS_VALUE_TYPE(
1895 ntp_snippets::kContentSuggestionsFeature, 1895 ntp_snippets::kContentSuggestionsFeature,
1896 kNTPSnippetsFeatureVariations, 1896 kNTPSnippetsFeatureVariations,
1897 ntp_snippets::kStudyName)}, 1897 ntp_snippets::kStudyName)},
1898 {"enable-ntp-offline-page-suggestions", 1898 {"enable-ntp-offline-page-suggestions",
1899 IDS_FLAGS_ENABLE_NTP_OFFLINE_PAGE_SUGGESTIONS_NAME, 1899 IDS_FLAGS_ENABLE_NTP_OFFLINE_PAGE_SUGGESTIONS_NAME,
1900 IDS_FLAGS_ENABLE_NTP_OFFLINE_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid, 1900 IDS_FLAGS_ENABLE_NTP_OFFLINE_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid,
1901 FEATURE_VALUE_TYPE(chrome::android::kNTPOfflinePageSuggestionsFeature)}, 1901 FEATURE_VALUE_TYPE(chrome::android::kNTPOfflinePageSuggestionsFeature)},
1902 {"enable-ntp-bookmark-suggestions",
1903 IDS_FLAGS_ENABLE_NTP_BOOKMARK_SUGGESTIONS_NAME,
1904 IDS_FLAGS_ENABLE_NTP_BOOKMARK_SUGGESTIONS_DESCRIPTION, kOsAndroid,
1905 FEATURE_VALUE_TYPE(ntp_snippets::kBookmarkSuggestionsFeature)},
1902 #endif // defined(OS_ANDROID) 1906 #endif // defined(OS_ANDROID)
1903 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1907 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
1904 {"enable-webrtc-h264-with-openh264-ffmpeg", 1908 {"enable-webrtc-h264-with-openh264-ffmpeg",
1905 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, 1909 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
1906 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop, 1910 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
1907 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, 1911 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)},
1908 #endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1912 #endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
1909 #if defined(OS_ANDROID) 1913 #if defined(OS_ANDROID)
1910 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION, 1914 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION,
1911 kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)}, 1915 kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)},
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
2228 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2232 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2229 2233
2230 const FeatureEntry* GetFeatureEntries(size_t* count) { 2234 const FeatureEntry* GetFeatureEntries(size_t* count) {
2231 *count = arraysize(kFeatureEntries); 2235 *count = arraysize(kFeatureEntries);
2232 return kFeatureEntries; 2236 return kFeatureEntries;
2233 } 2237 }
2234 2238
2235 } // namespace testing 2239 } // namespace testing
2236 2240
2237 } // namespace about_flags 2241 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ntp_snippets/content_suggestions_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698