Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / GeolocationClientProxy.cpp

diff --git a/src/third_party/WebKit/Source/web/GeolocationClientProxy.cpp b/src/third_party/WebKit/Source/web/GeolocationClientProxy.cpp
index 94ee7cf..aef8bef 100644 (file)
--- a/src/third_party/WebKit/Source/web/GeolocationClientProxy.cpp
+++ b/src/third_party/WebKit/Source/web/GeolocationClientProxy.cpp
@@ -24,16 +24,15 @@
  */
 
 #include "config.h"
-#include "GeolocationClientProxy.h"
+#include "web/GeolocationClientProxy.h"
 
-#include "WebGeolocationClient.h"
-#include "WebGeolocationController.h"
-#include "WebGeolocationPermissionRequest.h"
-#include "WebGeolocationPosition.h"
 #include "modules/geolocation/Geolocation.h"
 #include "modules/geolocation/GeolocationPosition.h"
+#include "public/web/WebGeolocationClient.h"
+#include "public/web/WebGeolocationPermissionRequest.h"
+#include "public/web/WebGeolocationPosition.h"
 
-namespace WebKit {
+namespace blink {
 
 GeolocationClientProxy::GeolocationClientProxy(WebGeolocationClient* client)
     : m_client(client)
@@ -44,7 +43,7 @@ GeolocationClientProxy::~GeolocationClientProxy()
 {
 }
 
-void GeolocationClientProxy::setController(WebCore::GeolocationController* controller)
+void GeolocationClientProxy::setController(GeolocationController* controller)
 {
     // We support there not being a client, provided we don't do any Geolocation.
     if (m_client) {
@@ -74,25 +73,25 @@ void GeolocationClientProxy::setEnableHighAccuracy(bool highAccuracy)
     m_client->setEnableHighAccuracy(highAccuracy);
 }
 
-WebCore::GeolocationPosition* GeolocationClientProxy::lastPosition()
+GeolocationPosition* GeolocationClientProxy::lastPosition()
 {
     WebGeolocationPosition webPosition;
     if (m_client->lastPosition(webPosition))
-        m_lastPosition = webPosition;
+        m_lastPosition = static_cast<GeolocationPosition*>(webPosition);
     else
         m_lastPosition.clear();
 
     return m_lastPosition.get();
 }
 
-void GeolocationClientProxy::requestPermission(WebCore::Geolocation* geolocation)
+void GeolocationClientProxy::requestPermission(Geolocation* geolocation)
 {
     m_client->requestPermission(WebGeolocationPermissionRequest(geolocation));
 }
 
-void GeolocationClientProxy::cancelPermissionRequest(WebCore::Geolocation* geolocation)
+void GeolocationClientProxy::cancelPermissionRequest(Geolocation* geolocation)
 {
     m_client->cancelPermissionRequest(WebGeolocationPermissionRequest(geolocation));
 }
 
-}
+} // namespace blink