chrome/chrome_browser.gypi - Issue 1677073002: Fetch snippets from ChromeReader and show them on the NTP

Unified Diff: chrome/chrome_browser.gypi

Issue 1677073002: Fetch snippets from ChromeReader and show them on the NTP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleaning up Created 4 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ntp_snippets/ntp_snippets_service_factory.cc ('K') | « chrome/browser/ntp_snippets/ntp_snippets_service_factory.cc ('k') | components/ntp_snippets.gypi » ('j') | components/ntp_snippets/ntp_snippets_fetcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 05ca4cbc7d0a650dfbfa20f1cee54113dec3f6f0..7b4f804dd11653ae14bc042fecd026d4b290ffe1 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -827,6 +827,10 @@

'browser/android/new_tab_page_prefs.h',

'browser/android/new_tab_page_url_handler.cc',

'browser/android/new_tab_page_url_handler.h',

+ 'browser/android/ntp_snippets_bridge.cc',

+ 'browser/android/ntp_snippets_bridge.h',

+ 'browser/android/ntp_snippets_controller.cc',

+ 'browser/android/ntp_snippets_controller.h',

'browser/android/omnibox/answers_image_bridge.cc',

'browser/android/omnibox/answers_image_bridge.h',

'browser/android/omnibox/autocomplete_controller_android.cc',

@@ -1867,10 +1871,16 @@

'android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java',

'android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java',

'android/java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java',

+ 'android/java/src/org/chromium/chrome/browser/ntp/interests/InterestsService.java',

'android/java/src/org/chromium/chrome/browser/ntp/LogoBridge.java',

'android/java/src/org/chromium/chrome/browser/ntp/NewTabPagePrefs.java',

'android/java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java',

- 'android/java/src/org/chromium/chrome/browser/ntp/interests/InterestsService.java',

+ 'android/java/src/org/chromium/chrome/browser/ntp/snippets/NTPSnippetsBridge.java',

+ 'android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsController.java',

+ 'android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java',

Marc Treib 2016/02/09 09:17:54 Eeeh.. where does this come from? Bad merge?

May 2016/02/09 17:38:53 Woah, good catch. ??? Must have been a bad merge.

+ 'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java',

+ 'android/java/src/org/chromium/chrome/browser/net/qualityprovider/ExternalEstimateProviderAndroid.java',

+ 'android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java',

'android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java',

'android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java',

'android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java',