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

Side by Side Diff: Source/modules/geolocation/GeolocationController.h

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 22 matching lines...) Expand all
33 #include "wtf/HashSet.h" 33 #include "wtf/HashSet.h"
34 #include "wtf/Noncopyable.h" 34 #include "wtf/Noncopyable.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class GeolocationInspectorAgent; 38 class GeolocationInspectorAgent;
39 class GeolocationClient; 39 class GeolocationClient;
40 class GeolocationError; 40 class GeolocationError;
41 class GeolocationPosition; 41 class GeolocationPosition;
42 42
43 class GeolocationController FINAL : public NoBaseWillBeGarbageCollectedFinalized <GeolocationController>, public WillBeHeapSupplement<LocalFrame>, public PageLif ecycleObserver { 43 class GeolocationController final : public NoBaseWillBeGarbageCollectedFinalized <GeolocationController>, public WillBeHeapSupplement<LocalFrame>, public PageLif ecycleObserver {
44 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(GeolocationController); 44 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(GeolocationController);
45 WTF_MAKE_NONCOPYABLE(GeolocationController); 45 WTF_MAKE_NONCOPYABLE(GeolocationController);
46 public: 46 public:
47 virtual ~GeolocationController(); 47 virtual ~GeolocationController();
48 48
49 static PassOwnPtrWillBeRawPtr<GeolocationController> create(LocalFrame&, Geo locationClient*); 49 static PassOwnPtrWillBeRawPtr<GeolocationController> create(LocalFrame&, Geo locationClient*);
50 50
51 void addObserver(Geolocation*, bool enableHighAccuracy); 51 void addObserver(Geolocation*, bool enableHighAccuracy);
52 void removeObserver(Geolocation*); 52 void removeObserver(Geolocation*);
53 53
54 void requestPermission(Geolocation*); 54 void requestPermission(Geolocation*);
55 void cancelPermissionRequest(Geolocation*); 55 void cancelPermissionRequest(Geolocation*);
56 56
57 void positionChanged(GeolocationPosition*); 57 void positionChanged(GeolocationPosition*);
58 void errorOccurred(GeolocationError*); 58 void errorOccurred(GeolocationError*);
59 59
60 GeolocationPosition* lastPosition(); 60 GeolocationPosition* lastPosition();
61 61
62 void setClientForTest(GeolocationClient*); 62 void setClientForTest(GeolocationClient*);
63 bool hasClientForTest() { return m_hasClientForTest; } 63 bool hasClientForTest() { return m_hasClientForTest; }
64 GeolocationClient* client() { return m_client; } 64 GeolocationClient* client() { return m_client; }
65 65
66 // Inherited from PageLifecycleObserver. 66 // Inherited from PageLifecycleObserver.
67 virtual void pageVisibilityChanged() OVERRIDE; 67 virtual void pageVisibilityChanged() override;
68 68
69 static const char* supplementName(); 69 static const char* supplementName();
70 static GeolocationController* from(LocalFrame* frame) { return static_cast<G eolocationController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementN ame())); } 70 static GeolocationController* from(LocalFrame* frame) { return static_cast<G eolocationController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementN ame())); }
71 71
72 // Inherited from Supplement. 72 // Inherited from Supplement.
73 virtual void trace(Visitor*) OVERRIDE; 73 virtual void trace(Visitor*) override;
74 74
75 private: 75 private:
76 GeolocationController(LocalFrame&, GeolocationClient*); 76 GeolocationController(LocalFrame&, GeolocationClient*);
77 77
78 void startUpdatingIfNeeded(); 78 void startUpdatingIfNeeded();
79 void stopUpdatingIfNeeded(); 79 void stopUpdatingIfNeeded();
80 80
81 RawPtrWillBeMember<GeolocationClient> m_client; 81 RawPtrWillBeMember<GeolocationClient> m_client;
82 bool m_hasClientForTest; 82 bool m_hasClientForTest;
83 83
84 PersistentWillBeMember<GeolocationPosition> m_lastPosition; 84 PersistentWillBeMember<GeolocationPosition> m_lastPosition;
85 typedef PersistentHeapHashSetWillBeHeapHashSet<Member<Geolocation> > Observe rsSet; 85 typedef PersistentHeapHashSetWillBeHeapHashSet<Member<Geolocation> > Observe rsSet;
86 // All observers; both those requesting high accuracy and those not. 86 // All observers; both those requesting high accuracy and those not.
87 ObserversSet m_observers; 87 ObserversSet m_observers;
88 ObserversSet m_highAccuracyObservers; 88 ObserversSet m_highAccuracyObservers;
89 bool m_isClientUpdating; 89 bool m_isClientUpdating;
90 RawPtrWillBeMember<GeolocationInspectorAgent> m_inspectorAgent; 90 RawPtrWillBeMember<GeolocationInspectorAgent> m_inspectorAgent;
91 }; 91 };
92 92
93 } // namespace blink 93 } // namespace blink
94 94
95 #endif // GeolocationController_h 95 #endif // GeolocationController_h
OLDNEW
« no previous file with comments | « Source/modules/geolocation/Geolocation.h ('k') | Source/modules/geolocation/GeolocationInspectorAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698