| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "modules/geolocation/GeoNotifier.h" | 6 #include "modules/geolocation/GeoNotifier.h" |
| 7 | 7 |
| 8 #include "modules/geolocation/Geolocation.h" | 8 #include "modules/geolocation/Geolocation.h" |
| 9 #include "modules/geolocation/PositionError.h" | 9 #include "modules/geolocation/PositionError.h" |
| 10 #include "modules/geolocation/PositionOptions.h" | 10 #include "modules/geolocation/PositionOptions.h" |
| 11 | 11 |
| 12 namespace blink { | 12 namespace blink { |
| 13 | 13 |
| 14 GeoNotifier::GeoNotifier(Geolocation* geolocation, PositionCallback* successCall
back, PositionErrorCallback* errorCallback, const PositionOptions& options) | 14 GeoNotifier::GeoNotifier(Geolocation* geolocation, PositionCallback* successCall
back, PositionErrorCallback* errorCallback, const PositionOptions& options) |
| 15 // FIXME : m_geolocation should be removed, it makes circular dependancy. | |
| 16 : m_geolocation(geolocation) | 15 : m_geolocation(geolocation) |
| 17 , m_successCallback(successCallback) | 16 , m_successCallback(successCallback) |
| 18 , m_errorCallback(errorCallback) | 17 , m_errorCallback(errorCallback) |
| 19 , m_options(options) | 18 , m_options(options) |
| 20 , m_timer(this, &GeoNotifier::timerFired) | 19 , m_timer(this, &GeoNotifier::timerFired) |
| 21 , m_useCachedPosition(false) | 20 , m_useCachedPosition(false) |
| 22 { | 21 { |
| 23 ASSERT(m_geolocation); | 22 ASSERT(m_geolocation); |
| 24 ASSERT(m_successCallback); | 23 ASSERT(m_successCallback); |
| 25 } | 24 } |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 m_geolocation->requestUsesCachedPosition(this); | 92 m_geolocation->requestUsesCachedPosition(this); |
| 94 return; | 93 return; |
| 95 } | 94 } |
| 96 | 95 |
| 97 if (m_errorCallback) | 96 if (m_errorCallback) |
| 98 m_errorCallback->handleEvent(PositionError::create(PositionError::TIMEOU
T, "Timeout expired")); | 97 m_errorCallback->handleEvent(PositionError::create(PositionError::TIMEOU
T, "Timeout expired")); |
| 99 m_geolocation->requestTimedOut(this); | 98 m_geolocation->requestTimedOut(this); |
| 100 } | 99 } |
| 101 | 100 |
| 102 } // namespace blink | 101 } // namespace blink |
| OLD | NEW |