From 6b70adc33054f8aee8c54d0f460458a9df11b8a5 Mon Sep 17 00:00:00 2001
From: Russell Brenner <russellbrenner@google.com>
Date: Thu, 18 Nov 2010 17:33:13 -0800
Subject: Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
---
 WebCore/page/GeolocationController.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebCore/page/GeolocationController.cpp')

diff --git a/WebCore/page/GeolocationController.cpp b/WebCore/page/GeolocationController.cpp
index 08932a9..db4cc23 100644
--- a/WebCore/page/GeolocationController.cpp
+++ b/WebCore/page/GeolocationController.cpp
@@ -29,11 +29,11 @@
 
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
 
-#include "GeolocationControllerClient.h"
+#include "GeolocationClient.h"
 
 namespace WebCore {
 
-GeolocationController::GeolocationController(Page* page, GeolocationControllerClient* client)
+GeolocationController::GeolocationController(Page* page, GeolocationClient* client)
     : m_page(page)
     , m_client(client)
 {
-- 
cgit v1.1