Index: Source/WebCore/platform/network/NetworkStateNotifier.h |
diff --git a/Source/WebCore/platform/network/NetworkStateNotifier.h b/Source/WebCore/platform/network/NetworkStateNotifier.h |
index dc8595dc40016808ac1b304be6dbfa4f79e0bbd9..0b147c2e4e3358affa54424cc6cea0c8f726ddd2 100644 |
--- a/Source/WebCore/platform/network/NetworkStateNotifier.h |
+++ b/Source/WebCore/platform/network/NetworkStateNotifier.h |
@@ -29,30 +29,8 @@ |
#include <wtf/FastAllocBase.h> |
#include <wtf/Noncopyable.h> |
-#if PLATFORM(MAC) |
- |
-#include <wtf/RetainPtr.h> |
-#include "Timer.h" |
- |
-typedef const struct __CFArray * CFArrayRef; |
-typedef const struct __SCDynamicStore * SCDynamicStoreRef; |
- |
-#elif PLATFORM(WIN) |
- |
-#include <windows.h> |
- |
-#elif PLATFORM(QT) |
- |
-#include <QtCore/qglobal.h> |
- |
-#endif |
- |
namespace WebCore { |
-#if (PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT)) |
-class NetworkStateNotifierPrivate; |
-#endif |
- |
class NetworkStateNotifier { |
WTF_MAKE_NONCOPYABLE(NetworkStateNotifier); WTF_MAKE_FAST_ALLOCATED; |
public: |
@@ -60,48 +38,15 @@ public: |
void setNetworkStateChangedFunction(void (*)()); |
bool onLine() const { return m_isOnLine; } |
- |
-#if (PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT)) |
- void setNetworkAccessAllowed(bool); |
-#elif PLATFORM(CHROMIUM) |
void setOnLine(bool); |
-#endif |
- |
-#if PLATFORM(BLACKBERRY) |
- void networkStateChange(bool online); |
-#endif |
private: |
bool m_isOnLine; |
void (*m_networkStateChangedFunction)(); |
void updateState(); |
- |
-#if PLATFORM(MAC) |
- void networkStateChangeTimerFired(Timer<NetworkStateNotifier>*); |
- |
- static void dynamicStoreCallback(SCDynamicStoreRef, CFArrayRef changedKeys, void *info); |
- |
- RetainPtr<SCDynamicStoreRef> m_store; |
- Timer<NetworkStateNotifier> m_networkStateChangeTimer; |
- |
-#elif PLATFORM(WIN) |
- static void CALLBACK addrChangeCallback(void*, BOOLEAN timedOut); |
- static void callAddressChanged(void*); |
- void addressChanged(); |
- |
- void registerForAddressChange(); |
- HANDLE m_waitHandle; |
- OVERLAPPED m_overlapped; |
- |
-#elif (PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT)) |
- friend class NetworkStateNotifierPrivate; |
- NetworkStateNotifierPrivate* p; |
-#endif |
}; |
-#if !PLATFORM(MAC) && !PLATFORM(WIN) && !(PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT)) && !PLATFORM(BLACKBERRY) |
- |
inline NetworkStateNotifier::NetworkStateNotifier() |
: m_isOnLine(true) |
, m_networkStateChangedFunction(0) |
@@ -110,8 +55,6 @@ inline NetworkStateNotifier::NetworkStateNotifier() |
inline void NetworkStateNotifier::updateState() { } |
-#endif |
- |
NetworkStateNotifier& networkStateNotifier(); |
}; |