| Index: content/browser/geolocation/geolocation_service_impl.cc
|
| diff --git a/content/browser/geolocation/geolocation_service_impl.cc b/content/browser/geolocation/geolocation_service_impl.cc
|
| index 19f303c5fccbeb9fe30280207e1f13b798ab8dc3..5424c141e588da403f040e072ae305d7881a5db8 100644
|
| --- a/content/browser/geolocation/geolocation_service_impl.cc
|
| +++ b/content/browser/geolocation/geolocation_service_impl.cc
|
| @@ -9,7 +9,6 @@
|
| #include "base/bind.h"
|
| #include "base/metrics/histogram.h"
|
| #include "content/browser/geolocation/geolocation_service_context.h"
|
| -#include "content/public/common/mojo_geoposition.mojom.h"
|
|
|
| namespace content {
|
|
|
| @@ -61,7 +60,7 @@ void RecordGeopositionErrorCode(Geoposition::ErrorCode error_code) {
|
| } // namespace
|
|
|
| GeolocationServiceImpl::GeolocationServiceImpl(
|
| - mojo::InterfaceRequest<mojom::GeolocationService> request,
|
| + mojo::InterfaceRequest<GeolocationService> request,
|
| GeolocationServiceContext* context,
|
| const base::Closure& update_callback)
|
| : binding_(this, std::move(request)),
|
| @@ -79,7 +78,7 @@ GeolocationServiceImpl::~GeolocationServiceImpl() {
|
| // Make sure to respond to any pending callback even without a valid position.
|
| if (!position_callback_.is_null()) {
|
| if (!current_position_.valid) {
|
| - current_position_.error_code = mojom::MojoGeoposition::ErrorCode(
|
| + current_position_.error_code = blink::mojom::Geoposition::ErrorCode(
|
| GEOPOSITION_ERROR_CODE_POSITION_UNAVAILABLE);
|
| current_position_.error_message = mojo::String("");
|
| }
|
| @@ -178,7 +177,7 @@ void GeolocationServiceImpl::OnLocationUpdate(const Geoposition& position) {
|
| current_position_.speed = position.speed;
|
| current_position_.timestamp = position.timestamp.ToDoubleT();
|
| current_position_.error_code =
|
| - mojom::MojoGeoposition::ErrorCode(position.error_code);
|
| + blink::mojom::Geoposition::ErrorCode(position.error_code);
|
| current_position_.error_message = position.error_message;
|
|
|
| has_position_to_report_ = true;
|
|
|