| Index: content/renderer/geolocation_dispatcher.cc
|
| diff --git a/content/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc
|
| index 031376c731879528127767296414efefbcb29693..a764b6107e2aa8fed1d33f4c8d5b016f62b6ccdf 100644
|
| --- a/content/renderer/geolocation_dispatcher.cc
|
| +++ b/content/renderer/geolocation_dispatcher.cc
|
| @@ -87,7 +87,7 @@ bool GeolocationDispatcher::lastPosition(WebGeolocationPosition&) {
|
| void GeolocationDispatcher::requestPermission(
|
| const WebGeolocationPermissionRequest& permissionRequest) {
|
| int bridge_id = pending_permissions_->add(permissionRequest);
|
| - string16 origin = permissionRequest.securityOrigin().toString();
|
| + base::string16 origin = permissionRequest.securityOrigin().toString();
|
| Send(new GeolocationHostMsg_RequestPermission(
|
| routing_id(), bridge_id, GURL(origin)));
|
| }
|
| @@ -99,7 +99,7 @@ void GeolocationDispatcher::cancelPermissionRequest(
|
| int bridge_id;
|
| if (!pending_permissions_->remove(permissionRequest, bridge_id))
|
| return;
|
| - string16 origin = permissionRequest.securityOrigin().toString();
|
| + base::string16 origin = permissionRequest.securityOrigin().toString();
|
| Send(new GeolocationHostMsg_CancelPermissionRequest(
|
| routing_id(), bridge_id, GURL(origin)));
|
| }
|
|
|