content/content_browser.gypi - Issue 1831173002: Scaffolding for Android implementation of PaymentRequest.

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: content/content_browser.gypi

Issue 1831173002: Scaffolding for Android implementation of PaymentRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo

Patch Set: Fix shell_mojo_test_utils_android.cc Created 4 years, 8 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

« content/browser/android/service_registry_android_impl.cc ('K') | « content/browser/mojo/service_registry_android.cc ('k') | content/public/android/java/src/org/chromium/content/browser/ServiceRegistry.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index 5761e08f84e37e35b8dd3067269f7d066a2ec46f..284a991deca87a079f184617fe276c88f3d2104f 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -97,6 +97,7 @@

'variables': {

'public_browser_sources': [

'public/browser/access_token_store.h',

+ 'public/browser/android/service_registry_android.h',

'public/browser/android/browser_media_player_manager_register.cc',

'public/browser/android/browser_media_player_manager_register.h',

'public/browser/android/compositor.h',

@@ -405,6 +406,8 @@

'browser/android/devtools_auth.cc',

'browser/android/in_process_surface_texture_manager.cc',

'browser/android/in_process_surface_texture_manager.h',

+ 'browser/android/service_registry_android_impl.cc',

+ 'browser/android/service_registry_android_impl.h',

'browser/android/url_request_content_job.cc',

'browser/android/url_request_content_job.h',

'browser/appcache/appcache.cc',

@@ -1127,8 +1130,6 @@

'browser/mojo/mojo_shell_context.h',

'browser/mojo/service_registrar_android.cc',

'browser/mojo/service_registrar_android.h',

- 'browser/mojo/service_registry_android.cc',

- 'browser/mojo/service_registry_android.h',

'browser/net/browser_online_state_observer.cc',

'browser/net/browser_online_state_observer.h',

'browser/net/network_errors_listing_ui.cc',