| Index: chrome/renderer/geolocation_dispatcher_old.cc
|
| diff --git a/chrome/renderer/geolocation_dispatcher_old.cc b/chrome/renderer/geolocation_dispatcher_old.cc
|
| deleted file mode 100644
|
| index 4a235c73b9a802316db6aa173bcb0d8483a9e162..0000000000000000000000000000000000000000
|
| --- a/chrome/renderer/geolocation_dispatcher_old.cc
|
| +++ /dev/null
|
| @@ -1,116 +0,0 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
|
| -#include "chrome/renderer/geolocation_dispatcher_old.h"
|
| -#include "base/command_line.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| -#include "chrome/renderer/render_view.h"
|
| -#include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
|
| -#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
|
| -#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationServiceBridge.h"
|
| -
|
| -using WebKit::WebFrame;
|
| -
|
| -GeolocationDispatcherOld::GeolocationDispatcherOld(RenderView* render_view)
|
| - : render_view_(render_view) {
|
| - render_view_->Send(new ViewHostMsg_Geolocation_RegisterDispatcher(
|
| - render_view_->routing_id()));
|
| -}
|
| -
|
| -GeolocationDispatcherOld::~GeolocationDispatcherOld() {
|
| - for (IDMap<WebKit::WebGeolocationServiceBridge>::iterator it(&bridges_map_);
|
| - !it.IsAtEnd(); it.Advance()) {
|
| - it.GetCurrentValue()->onWebGeolocationServiceDestroyed();
|
| - }
|
| - render_view_->Send(new ViewHostMsg_Geolocation_UnregisterDispatcher(
|
| - render_view_->routing_id()));
|
| -}
|
| -
|
| -bool GeolocationDispatcherOld::OnMessageReceived(const IPC::Message& message) {
|
| - bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(GeolocationDispatcherOld, message)
|
| - IPC_MESSAGE_HANDLER(ViewMsg_Geolocation_PermissionSet,
|
| - OnGeolocationPermissionSet)
|
| - IPC_MESSAGE_HANDLER(ViewMsg_Geolocation_PositionUpdated,
|
| - OnGeolocationPositionUpdated)
|
| - IPC_MESSAGE_UNHANDLED(handled = false)
|
| - IPC_END_MESSAGE_MAP()
|
| - return handled;
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::requestPermissionForFrame(
|
| - int bridge_id, const WebKit::WebURL& url) {
|
| - render_view_->Send(new ViewHostMsg_Geolocation_RequestPermission(
|
| - render_view_->routing_id(), bridge_id, GURL(url)));
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::cancelPermissionRequestForFrame(
|
| - int bridge_id, const WebKit::WebURL& url) {
|
| - render_view_->Send(new ViewHostMsg_Geolocation_CancelPermissionRequest(
|
| - render_view_->routing_id(), bridge_id, GURL(url)));
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::startUpdating(
|
| - int bridge_id, const WebKit::WebURL& url, bool enableHighAccuracy) {
|
| - render_view_->Send(new ViewHostMsg_Geolocation_StartUpdating(
|
| - render_view_->routing_id(), bridge_id, GURL(url),
|
| - enableHighAccuracy));
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::stopUpdating(int bridge_id) {
|
| - render_view_->Send(new ViewHostMsg_Geolocation_StopUpdating(
|
| - render_view_->routing_id(), bridge_id));
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::suspend(int bridge_id) {
|
| - render_view_->Send(new ViewHostMsg_Geolocation_Suspend(
|
| - render_view_->routing_id(), bridge_id));
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::resume(int bridge_id) {
|
| - render_view_->Send(new ViewHostMsg_Geolocation_Resume(
|
| - render_view_->routing_id(), bridge_id));
|
| -}
|
| -
|
| -int GeolocationDispatcherOld::attachBridge(
|
| - WebKit::WebGeolocationServiceBridge* bridge) {
|
| - return bridges_map_.Add(bridge);
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::detachBridge(int bridge_id) {
|
| - bridges_map_.Remove(bridge_id);
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::OnGeolocationPermissionSet(int bridge_id,
|
| - bool allowed) {
|
| - WebKit::WebGeolocationServiceBridge* bridge = bridges_map_.Lookup(bridge_id);
|
| - if (bridge) {
|
| - bridge->setIsAllowed(allowed);
|
| - }
|
| -}
|
| -
|
| -void GeolocationDispatcherOld::OnGeolocationPositionUpdated(
|
| - const Geoposition& geoposition) {
|
| - DCHECK(geoposition.IsInitialized());
|
| - for (IDMap<WebKit::WebGeolocationServiceBridge>::iterator it(&bridges_map_);
|
| - !it.IsAtEnd(); it.Advance()) {
|
| - if (geoposition.IsValidFix()) {
|
| - it.GetCurrentValue()->setLastPosition(
|
| - geoposition.latitude, geoposition.longitude,
|
| - geoposition.is_valid_altitude(), geoposition.altitude,
|
| - geoposition.accuracy,
|
| - geoposition.is_valid_altitude_accuracy(),
|
| - geoposition.altitude_accuracy,
|
| - geoposition.is_valid_heading(), geoposition.heading,
|
| - geoposition.is_valid_speed(), geoposition.speed,
|
| - static_cast<int64>(geoposition.timestamp.ToDoubleT() * 1000));
|
| - } else {
|
| - it.GetCurrentValue()->setLastError(
|
| - geoposition.error_code,
|
| - WebKit::WebString::fromUTF8(geoposition.error_message));
|
| - }
|
| - }
|
| -}
|
| -#endif // !ENABLE_CLIENT_BASED_GEOLOCATION
|
|
|