| OLD | NEW |
| 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/renderer/geolocation_dispatcher.h" | 5 #include "content/renderer/geolocation_dispatcher.h" |
| 6 | 6 |
| 7 #include "content/public/common/geoposition.h" | 7 #include "content/public/common/geoposition.h" |
| 8 #include "content/renderer/render_view_impl.h" | 8 #include "content/renderer/render_view_impl.h" |
| 9 #include "third_party/WebKit/public/platform/WebString.h" | 9 #include "third_party/WebKit/public/platform/WebString.h" |
| 10 #include "third_party/WebKit/public/web/WebGeolocationPermissionRequest.h" | 10 #include "third_party/WebKit/public/web/WebGeolocationPermissionRequest.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 const WebGeolocationPermissionRequest& permissionRequest) { | 74 const WebGeolocationPermissionRequest& permissionRequest) { |
| 75 if (!permission_service_.get()) { | 75 if (!permission_service_.get()) { |
| 76 render_frame()->GetServiceRegistry()->ConnectToRemoteService( | 76 render_frame()->GetServiceRegistry()->ConnectToRemoteService( |
| 77 mojo::GetProxy(&permission_service_)); | 77 mojo::GetProxy(&permission_service_)); |
| 78 } | 78 } |
| 79 | 79 |
| 80 int permission_request_id = pending_permissions_->add(permissionRequest); | 80 int permission_request_id = pending_permissions_->add(permissionRequest); |
| 81 | 81 |
| 82 permission_service_->RequestPermission( | 82 permission_service_->RequestPermission( |
| 83 PermissionName::GEOLOCATION, | 83 PermissionName::GEOLOCATION, |
| 84 permissionRequest.securityOrigin().toString().utf8(), | 84 permissionRequest.getSecurityOrigin().toString().utf8(), |
| 85 base::Bind(&GeolocationDispatcher::OnPermissionSet, | 85 base::Bind(&GeolocationDispatcher::OnPermissionSet, |
| 86 base::Unretained(this), permission_request_id)); | 86 base::Unretained(this), permission_request_id)); |
| 87 } | 87 } |
| 88 | 88 |
| 89 void GeolocationDispatcher::cancelPermissionRequest( | 89 void GeolocationDispatcher::cancelPermissionRequest( |
| 90 const blink::WebGeolocationPermissionRequest& permissionRequest) { | 90 const blink::WebGeolocationPermissionRequest& permissionRequest) { |
| 91 int permission_request_id; | 91 int permission_request_id; |
| 92 pending_permissions_->remove(permissionRequest, permission_request_id); | 92 pending_permissions_->remove(permissionRequest, permission_request_id); |
| 93 } | 93 } |
| 94 | 94 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 default: | 140 default: |
| 141 NOTREACHED() << geoposition->error_code; | 141 NOTREACHED() << geoposition->error_code; |
| 142 return; | 142 return; |
| 143 } | 143 } |
| 144 controller_->errorOccurred(WebGeolocationError( | 144 controller_->errorOccurred(WebGeolocationError( |
| 145 code, blink::WebString::fromUTF8(geoposition->error_message))); | 145 code, blink::WebString::fromUTF8(geoposition->error_message))); |
| 146 } | 146 } |
| 147 } | 147 } |
| 148 | 148 |
| 149 } // namespace content | 149 } // namespace content |
| OLD | NEW |