Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Side by Side Diff: content/browser/geolocation/location_arbitrator_impl.cc

Issue 25752005: Geolocation: delete GpsLocationProvider and third_party/gpsd/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/geolocation/location_arbitrator_impl.h" 5 #include "content/browser/geolocation/location_arbitrator_impl.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 #if defined(OS_ANDROID) 153 #if defined(OS_ANDROID)
154 // Android uses its own SystemLocationProvider. 154 // Android uses its own SystemLocationProvider.
155 return NULL; 155 return NULL;
156 #else 156 #else
157 return new NetworkLocationProvider(access_token_store, context, url, 157 return new NetworkLocationProvider(access_token_store, context, url,
158 access_token); 158 access_token);
159 #endif 159 #endif
160 } 160 }
161 161
162 LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() { 162 LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
163 #if defined(OS_WIN) || defined(OS_MACOSX) 163 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
164 return NULL; 164 return NULL;
165 #else 165 #else
166 return content::NewSystemLocationProvider(); 166 return content::NewSystemLocationProvider();
167 #endif 167 #endif
168 } 168 }
169 169
170 base::Time LocationArbitratorImpl::GetTimeNow() const { 170 base::Time LocationArbitratorImpl::GetTimeNow() const {
171 return base::Time::Now(); 171 return base::Time::Now();
172 } 172 }
173 173
(...skipping 21 matching lines...) Expand all
195 } 195 }
196 } 196 }
197 return false; 197 return false;
198 } 198 }
199 199
200 bool LocationArbitratorImpl::HasPermissionBeenGranted() const { 200 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
201 return is_permission_granted_; 201 return is_permission_granted_;
202 } 202 }
203 203
204 } // namespace content 204 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/geolocation/gps_location_provider_unittest_linux.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698