diff options
author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 00:30:28 +0000 |
---|---|---|
committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 00:30:28 +0000 |
commit | 26db3cd4291b572d262d26acc77bc2b873479038 (patch) | |
tree | 59b8f8c8d98bc7baaacced339e9cefa1273f9fe7 /webkit/port | |
parent | 4d0bd1045bc0df8daea2a5626e73906cb074631b (diff) | |
download | chromium_src-26db3cd4291b572d262d26acc77bc2b873479038.zip chromium_src-26db3cd4291b572d262d26acc77bc2b873479038.tar.gz chromium_src-26db3cd4291b572d262d26acc77bc2b873479038.tar.bz2 |
Fix mac bustage caused by my big Win.cpp to Chromium.cpp change. To keep the
mac build happy, I had to make sure that platform/mac is included before
platform/chromium. The NetworkStateNotifierChromium.cpp hacking is just to
deal with the fact that PLATFORM(MAC) is defined.
TBR=pinkerton
Review URL: http://codereview.chromium.org/7382
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r-- | webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp b/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp index 8d0d877..db40b10 100644 --- a/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp +++ b/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp @@ -53,10 +53,17 @@ void CALLBACK NetworkStateNotifier::addrChangeCallback(void* context, BOOLEAN ti void NetworkStateNotifier::registerForAddressChange()
{
}
+#elif PLATFORM(MAC)
+void NetworkStateNotifier::networkStateChangeTimerFired(Timer<NetworkStateNotifier>*)
+{
+}
#endif
NetworkStateNotifier::NetworkStateNotifier()
: m_isOnLine(true)
+#if PLATFORM(MAC)
+ , m_networkStateChangeTimer(this, &NetworkStateNotifier::networkStateChangeTimerFired)
+#endif
{
}
|