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

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

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 | Annotate | Revision Log
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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 position_provider_ = provider; 120 position_provider_ = provider;
121 position_ = new_position; 121 position_ = new_position;
122 callback_.Run(position_); 122 callback_.Run(position_);
123 } 123 }
124 124
125 AccessTokenStore* GeolocationArbitratorImpl::NewAccessTokenStore() { 125 AccessTokenStore* GeolocationArbitratorImpl::NewAccessTokenStore() {
126 return GetContentClient()->browser()->CreateAccessTokenStore(); 126 return GetContentClient()->browser()->CreateAccessTokenStore();
127 } 127 }
128 128
129 AccessTokenStore* GeolocationArbitratorImpl::GetAccessTokenStore() { 129 AccessTokenStore* GeolocationArbitratorImpl::GetAccessTokenStore() {
130 if (!access_token_store_) 130 if (!access_token_store_.get())
131 access_token_store_ = NewAccessTokenStore(); 131 access_token_store_ = NewAccessTokenStore();
132 return access_token_store_.get(); 132 return access_token_store_.get();
133 } 133 }
134 134
135 LocationProviderBase* GeolocationArbitratorImpl::NewNetworkLocationProvider( 135 LocationProviderBase* GeolocationArbitratorImpl::NewNetworkLocationProvider(
136 AccessTokenStore* access_token_store, 136 AccessTokenStore* access_token_store,
137 net::URLRequestContextGetter* context, 137 net::URLRequestContextGetter* context,
138 const GURL& url, 138 const GURL& url,
139 const string16& access_token) { 139 const string16& access_token) {
140 #if defined(OS_ANDROID) 140 #if defined(OS_ANDROID)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 } 178 }
179 } 179 }
180 return false; 180 return false;
181 } 181 }
182 182
183 bool GeolocationArbitratorImpl::HasPermissionBeenGranted() const { 183 bool GeolocationArbitratorImpl::HasPermissionBeenGranted() const {
184 return is_permission_granted_; 184 return is_permission_granted_;
185 } 185 }
186 186
187 } // namespace content 187 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698