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

Unified Diff: content/browser/geolocation/geolocation_service_impl.cc

Issue 1373883003: Move geolocation and permission mojoms into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
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 aae95ac01b6bf465564048bee3e7b197d2cc70b8..98ad95e0c5f20abb224318748061a6e832390e4e 100644
--- a/content/browser/geolocation/geolocation_service_impl.cc
+++ b/content/browser/geolocation/geolocation_service_impl.cc
@@ -7,7 +7,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 {
@@ -77,7 +76,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 = MojoGeoposition::ErrorCode(
+ current_position_.error_code = geolocation::Geoposition::ErrorCode(
GEOPOSITION_ERROR_CODE_POSITION_UNAVAILABLE);
current_position_.error_message = mojo::String("");
}
@@ -176,7 +175,7 @@ void GeolocationServiceImpl::OnLocationUpdate(const Geoposition& position) {
current_position_.speed = position.speed;
current_position_.timestamp = position.timestamp.ToDoubleT();
current_position_.error_code =
- MojoGeoposition::ErrorCode(position.error_code);
+ geolocation::Geoposition::ErrorCode(position.error_code);
current_position_.error_message = position.error_message;
has_position_to_report_ = true;
« no previous file with comments | « content/browser/geolocation/geolocation_service_impl.h ('k') | content/browser/media/cdm/browser_cdm_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698