diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 07:03:07 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 07:03:07 +0000 |
| commit | d61cdc0177d95917a6fc37aabb4b33a27396e527 (patch) | |
| tree | b8ebe03f15211e040155cb8e0c57dd5e50f55564 /webkit/port | |
| parent | 69a613f3a95c188524ac8e590fb45396b047c9ee (diff) | |
| download | chromium_src-d61cdc0177d95917a6fc37aabb4b33a27396e527.zip chromium_src-d61cdc0177d95917a6fc37aabb4b33a27396e527.tar.gz chromium_src-d61cdc0177d95917a6fc37aabb4b33a27396e527.tar.bz2 | |
linux compile fixes
patch by icefox (Torchmobile) at http://codereview.chromium.org/7488
Review URL: http://codereview.chromium.org/7658
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
| -rw-r--r-- | webkit/port/platform/chromium/ContextMenuItemChromium.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/webkit/port/platform/chromium/ContextMenuItemChromium.cpp b/webkit/port/platform/chromium/ContextMenuItemChromium.cpp index 1aab658..ebdc9c9 100644 --- a/webkit/port/platform/chromium/ContextMenuItemChromium.cpp +++ b/webkit/port/platform/chromium/ContextMenuItemChromium.cpp @@ -51,7 +51,7 @@ ContextMenuItem::~ContextMenuItem() PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription() { - return 0; + return PlatformMenuItemDescription(); } ContextMenuItemType ContextMenuItem::type() const diff --git a/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp b/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp index b7e8f08..a4475c3 100644 --- a/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp +++ b/webkit/port/platform/network/chromium/NetworkStateNotifierChromium.cpp @@ -43,6 +43,7 @@ void NetworkStateNotifier::networkStateChangeTimerFired(Timer<NetworkStateNotifi }
#endif
+#if PLATFORM(WIN) || PLATFORM(MAC)
NetworkStateNotifier::NetworkStateNotifier()
: m_isOnLine(true)
#if PLATFORM(MAC)
@@ -50,5 +51,6 @@ NetworkStateNotifier::NetworkStateNotifier() #endif
{
}
+#endif
}
|