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

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

Issue 2683653007: Show a Google "G" in the omnibox on the New Tab Page. (Closed)
Patch Set: comment Created 3 years, 10 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 {"enable-ntp-suggestions-notifications", 1875 {"enable-ntp-suggestions-notifications",
1876 IDS_FLAGS_ENABLE_NTP_SUGGESTIONS_NOTIFICATIONS_NAME, 1876 IDS_FLAGS_ENABLE_NTP_SUGGESTIONS_NOTIFICATIONS_NAME,
1877 IDS_FLAGS_ENABLE_NTP_SUGGESTIONS_NOTIFICATIONS_DESCRIPTION, kOsAndroid, 1877 IDS_FLAGS_ENABLE_NTP_SUGGESTIONS_NOTIFICATIONS_DESCRIPTION, kOsAndroid,
1878 FEATURE_WITH_VARIATIONS_VALUE_TYPE( 1878 FEATURE_WITH_VARIATIONS_VALUE_TYPE(
1879 kContentSuggestionsNotificationsFeature, 1879 kContentSuggestionsNotificationsFeature,
1880 kContentSuggestionsNotificationsFeatureVariations, 1880 kContentSuggestionsNotificationsFeatureVariations,
1881 ntp_snippets::kStudyName)}, 1881 ntp_snippets::kStudyName)},
1882 {"ntp-condensed-layout", IDS_FLAGS_NTP_CONDENSED_LAYOUT_NAME, 1882 {"ntp-condensed-layout", IDS_FLAGS_NTP_CONDENSED_LAYOUT_NAME,
1883 IDS_FLAGS_NTP_CONDENSED_LAYOUT_DESCRIPTION, kOsAndroid, 1883 IDS_FLAGS_NTP_CONDENSED_LAYOUT_DESCRIPTION, kOsAndroid,
1884 FEATURE_VALUE_TYPE(chrome::android::kNTPCondensedLayoutFeature)}, 1884 FEATURE_VALUE_TYPE(chrome::android::kNTPCondensedLayoutFeature)},
1885 {"ntp-google-g-in-omnibox", IDS_FLAGS_NTP_GOOGLE_G_IN_OMNIBOX_NAME,
1886 IDS_FLAGS_NTP_GOOGLE_G_IN_OMNIBOX_DESCRIPTION, kOsAndroid,
1887 FEATURE_VALUE_TYPE(chrome::android::NTPShowGoogleGInOmniboxFeature)},
1885 #endif // OS_ANDROID 1888 #endif // OS_ANDROID
1886 #if BUILDFLAG(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \ 1889 #if BUILDFLAG(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \
1887 !defined(MEDIA_DISABLE_FFMPEG) 1890 !defined(MEDIA_DISABLE_FFMPEG)
1888 {"enable-webrtc-h264-with-openh264-ffmpeg", 1891 {"enable-webrtc-h264-with-openh264-ffmpeg",
1889 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, 1892 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
1890 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop, 1893 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
1891 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, 1894 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)},
1892 #endif // ENABLE_WEBRTC && BUILDFLAG(RTC_USE_H264) && !MEDIA_DISABLE_FFMPEG 1895 #endif // ENABLE_WEBRTC && BUILDFLAG(RTC_USE_H264) && !MEDIA_DISABLE_FFMPEG
1893 #if defined(OS_ANDROID) 1896 #if defined(OS_ANDROID)
1894 {"offline-pages-ntp", IDS_FLAGS_NTP_OFFLINE_PAGES_NAME, 1897 {"offline-pages-ntp", IDS_FLAGS_NTP_OFFLINE_PAGES_NAME,
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
2410 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2413 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2411 2414
2412 const FeatureEntry* GetFeatureEntries(size_t* count) { 2415 const FeatureEntry* GetFeatureEntries(size_t* count) {
2413 *count = arraysize(kFeatureEntries); 2416 *count = arraysize(kFeatureEntries);
2414 return kFeatureEntries; 2417 return kFeatureEntries;
2415 } 2418 }
2416 2419
2417 } // namespace testing 2420 } // namespace testing
2418 2421
2419 } // namespace about_flags 2422 } // 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