content/browser/geolocation/arbitrator_dependency_factory.cc - Issue 10209003: Upstream Android Geolocation

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/browser/geolocation/arbitrator_dependency_factory.cc

Issue 10209003: Upstream Android Geolocation (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Add jni/ to allowed includes for check deps. Created 8 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:

Index: content/browser/geolocation/arbitrator_dependency_factory.cc

diff --git a/content/browser/geolocation/arbitrator_dependency_factory.cc b/content/browser/geolocation/arbitrator_dependency_factory.cc

index 60225b60ae501034229a731dd032d32f84a1d6c1..170f6d3ee1ef1ce68cc1803a533b35dce0d2aec4 100644

--- a/content/browser/geolocation/arbitrator_dependency_factory.cc

+++ b/content/browser/geolocation/arbitrator_dependency_factory.cc

@@ -33,8 +33,13 @@ DefaultGeolocationArbitratorDependencyFactory::NewNetworkLocationProvider(

net::URLRequestContextGetter* context,

const GURL& url,

const string16& access_token) {

+#if defined(OS_ANDROID)

+ // Android uses its own SystemLocationProvider.

+ return NULL;

+#else

return ::NewNetworkLocationProvider(access_token_store, context,

url, access_token);

+#endif

}

LocationProviderBase*