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

Unified Diff: Source/modules/geolocation/GeolocationController.h

Issue 256843004: Get the WebGeolocationClient from WebFrameClient instead of WebViewClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix layouttest, fix webkit_unit_tests crash, remove obsolete layout test Created 6 years, 8 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: Source/modules/geolocation/GeolocationController.h
diff --git a/Source/modules/geolocation/GeolocationController.h b/Source/modules/geolocation/GeolocationController.h
index 118d042a6af54d4f582d8d175395ac7092f1140b..2422e15357a4d43737200550545164c3dd421535 100644
--- a/Source/modules/geolocation/GeolocationController.h
+++ b/Source/modules/geolocation/GeolocationController.h
@@ -26,7 +26,7 @@
#ifndef GeolocationController_h
#define GeolocationController_h
-#include "core/page/Page.h"
+#include "core/frame/LocalFrame.h"
#include "core/page/PageLifecycleObserver.h"
#include "modules/geolocation/Geolocation.h"
#include "platform/heap/Handle.h"
@@ -40,14 +40,13 @@ class GeolocationInspectorAgent;
class GeolocationClient;
class GeolocationError;
class GeolocationPosition;
-class Page;
-class GeolocationController FINAL : public Supplement<Page>, public PageLifecycleObserver {
+class GeolocationController FINAL : public Supplement<LocalFrame>, public PageLifecycleObserver {
WTF_MAKE_NONCOPYABLE(GeolocationController);
public:
virtual ~GeolocationController();
- static PassOwnPtr<GeolocationController> create(Page&, GeolocationClient*);
+ static PassOwnPtr<GeolocationController> create(LocalFrame&, GeolocationClient*);
void addObserver(Geolocation*, bool enableHighAccuracy);
void removeObserver(Geolocation*);
@@ -68,14 +67,14 @@ public:
virtual void pageVisibilityChanged() OVERRIDE;
static const char* supplementName();
- static GeolocationController* from(Page* page) { return static_cast<GeolocationController*>(Supplement<Page>::from(page, supplementName())); }
+ static GeolocationController* from(LocalFrame* frame) { return static_cast<GeolocationController*>(Supplement<LocalFrame>::from(frame, supplementName())); }
virtual void trace(Visitor*) OVERRIDE { };
virtual void willBeDestroyed() OVERRIDE;
private:
- GeolocationController(Page&, GeolocationClient*);
+ GeolocationController(LocalFrame&, GeolocationClient*);
void startUpdatingIfNeeded();
void stopUpdatingIfNeeded();

Powered by Google App Engine
This is Rietveld 408576698