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

Unified Diff: chrome/browser/renderer_host/render_message_filter.cc

Issue 5612005: Client-based geolocation support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on trunk Created 10 years 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
« no previous file with comments | « chrome/browser/renderer_host/render_message_filter.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/render_message_filter.cc
diff --git a/chrome/browser/renderer_host/render_message_filter.cc b/chrome/browser/renderer_host/render_message_filter.cc
index 6f12cddc31854cf3cb7330f887a5e3ede47fadfa..5fa92ec271e56a143b3d57e126bc72ae8bb79d9f 100644
--- a/chrome/browser/renderer_host/render_message_filter.cc
+++ b/chrome/browser/renderer_host/render_message_filter.cc
@@ -21,8 +21,7 @@
#include "chrome/browser/clipboard_dispatcher.h"
#include "chrome/browser/download/download_types.h"
#include "chrome/browser/extensions/extension_message_service.h"
-#include "chrome/browser/geolocation/geolocation_dispatcher_host_old.h"
-#include "chrome/browser/geolocation/geolocation_permission_context.h"
+#include "chrome/browser/file_system/file_system_dispatcher_host.h"
jam 2010/12/14 23:27:02 this got merged in by accident, this include shoul
#include "chrome/browser/gpu_process_host.h"
#include "chrome/browser/host_zoom_map.h"
#include "chrome/browser/metrics/histogram_synchronizer.h"
@@ -251,9 +250,6 @@ RenderMessageFilter::RenderMessageFilter(
off_the_record_(profile->IsOffTheRecord()),
next_route_id_callback_(NewCallbackWithReturnValue(
render_widget_helper, &RenderWidgetHelper::GetNextRoutingID)),
- ALLOW_THIS_IN_INITIALIZER_LIST(geolocation_dispatcher_host_(
- GeolocationDispatcherHostOld::New(
- this->id(), profile->GetGeolocationPermissionContext()))),
webkit_context_(profile->GetWebKitContext()) {
request_context_ = profile_->GetRequestContext();
DCHECK(request_context_);
@@ -324,8 +320,7 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& msg) {
bool handled =
resource_dispatcher_host_->OnMessageReceived(msg, this, &msg_is_ok) ||
mp_dispatcher->OnMessageReceived(
- msg, this, next_route_id_callback(), &msg_is_ok) ||
- geolocation_dispatcher_host_->OnMessageReceived(msg, &msg_is_ok);
+ msg, this, next_route_id_callback(), &msg_is_ok);
if (!handled) {
DCHECK(msg_is_ok); // It should have been marked handled if it wasn't OK.
« no previous file with comments | « chrome/browser/renderer_host/render_message_filter.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698