device/geolocation/network_location_provider.cc - Issue 2226143002: Gets rid of the LocationArbitrator interface, in preference for LocationProvider.

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: device/geolocation/network_location_provider.cc

Issue 2226143002: Gets rid of the LocationArbitrator interface, in preference for LocationProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge branch 'master' into lai Created 4 years, 4 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

« device/geolocation/network_location_provider.h ('K') | « device/geolocation/network_location_provider.h ('k') | device/geolocation/network_location_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/geolocation/network_location_provider.cc

diff --git a/device/geolocation/network_location_provider.cc b/device/geolocation/network_location_provider.cc

index 46206a158fb0018e47dfd75d64245e5681dc8f0e..bbe3e1b63708158371ae21dfc6a23fb5e090df84 100644

--- a/device/geolocation/network_location_provider.cc

+++ b/device/geolocation/network_location_provider.cc

@@ -4,6 +4,8 @@

#include "device/geolocation/network_location_provider.h"

+#include <utility>

#include "base/bind.h"

#include "base/location.h"

#include "base/single_thread_task_runner.h"

@@ -128,9 +130,8 @@ NetworkLocationProvider::~NetworkLocationProvider() {

}

// LocationProvider implementation

-void NetworkLocationProvider::GetPosition(Geoposition* position) {

- DCHECK(position);

- *position = position_;

+const Geoposition& NetworkLocationProvider::GetPosition() {

+ return position_;

}

void NetworkLocationProvider::RequestRefresh() {