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

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

Issue 2028823002: Refactor to make BlimpLocationProvider accessible to content layer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes in response to creis Created 4 years, 6 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 } 93 }
94 94
95 void LocationArbitratorImpl::OnAccessTokenStoresLoaded( 95 void LocationArbitratorImpl::OnAccessTokenStoresLoaded(
96 AccessTokenStore::AccessTokenMap access_token_map, 96 AccessTokenStore::AccessTokenMap access_token_map,
97 net::URLRequestContextGetter* context_getter) { 97 net::URLRequestContextGetter* context_getter) {
98 if (!is_running_ || !providers_.empty()) { 98 if (!is_running_ || !providers_.empty()) {
99 // A second StartProviders() call may have arrived before the first 99 // A second StartProviders() call may have arrived before the first
100 // completed. 100 // completed.
101 return; 101 return;
102 } 102 }
103 // If there are no access tokens, boot strap it with the default server URL. 103 LocationProvider* sole_provider =
104 if (access_token_map.empty()) 104 GetContentClient()->browser()->GetSoleLocationProvider();
105 access_token_map[DefaultNetworkProviderURL()]; 105 if (!sole_provider) {
106 for (const auto& entry : access_token_map) { 106 // If there are no access tokens, boot strap it with the default server URL.
107 RegisterProvider(NewNetworkLocationProvider( 107 if (access_token_map.empty())
108 GetAccessTokenStore(), context_getter, entry.first, entry.second)); 108 access_token_map[DefaultNetworkProviderURL()];
109 for (const auto& entry : access_token_map) {
110 RegisterProvider(NewNetworkLocationProvider(
111 GetAccessTokenStore(), context_getter, entry.first, entry.second));
112 }
113
114 LocationProvider* provider =
115 GetContentClient()->browser()->OverrideSystemLocationProvider();
116 if (!provider)
117 provider = NewSystemLocationProvider();
118 RegisterProvider(provider);
119 } else {
120 RegisterProvider(sole_provider);
109 } 121 }
110
111 LocationProvider* provider =
112 GetContentClient()->browser()->OverrideSystemLocationProvider();
113 if (!provider)
114 provider = NewSystemLocationProvider();
115 RegisterProvider(provider);
116 DoStartProviders(); 122 DoStartProviders();
117 } 123 }
118 124
119 void LocationArbitratorImpl::RegisterProvider( 125 void LocationArbitratorImpl::RegisterProvider(
120 LocationProvider* provider) { 126 LocationProvider* provider) {
121 if (!provider) 127 if (!provider)
122 return; 128 return;
123 provider->SetUpdateCallback(provider_update_callback_); 129 provider->SetUpdateCallback(provider_update_callback_);
124 if (is_permission_granted_) 130 if (is_permission_granted_)
125 provider->OnPermissionGranted(); 131 provider->OnPermissionGranted();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 } 204 }
199 } 205 }
200 return false; 206 return false;
201 } 207 }
202 208
203 bool LocationArbitratorImpl::HasPermissionBeenGranted() const { 209 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
204 return is_permission_granted_; 210 return is_permission_granted_;
205 } 211 }
206 212
207 } // namespace content 213 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698