chrome/chrome_browser.gypi - Issue 839663003: Upstream partner customizations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser.gypi

Issue 839663003: Upstream partner customizations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: combined partner_bookmarks and bookmarks folder Created 5 years, 11 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:

Index: chrome/chrome_browser.gypi

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

index eb837be31461e34b98022e2d9443dfaf8bde1560..26c2fb94f086b5981b818ea5fce00f9763ee57a7 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -39,6 +39,8 @@

'browser/android/banners/app_banner_utilities.h',

'browser/android/bookmarks/bookmarks_bridge.cc',

'browser/android/bookmarks/bookmarks_bridge.h',

+ 'browser/android/bookmarks/partner_bookmarks_reader.cc',

+ 'browser/android/bookmarks/partner_bookmarks_reader.h',

'browser/android/bookmarks/partner_bookmarks_shim.cc',

'browser/android/bookmarks/partner_bookmarks_shim.h',

'browser/android/chrome_jni_registrar.cc',

@@ -1589,6 +1591,7 @@

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

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

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

+ 'android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReader.java',

'android/java/src/org/chromium/chrome/browser/password_manager/PasswordAuthenticationManager.java',

'android/java/src/org/chromium/chrome/browser/PasswordUIView.java',

'android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java',