webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 8 insertions, 20 deletions

diff --git a/Source/WebCore/page/ContextMenuClient.h b/Source/WebCore/page/ContextMenuClient.h
index 23d3a5aa6..990c1e0b1 100644
--- a/Source/WebCore/page/ContextMenuClient.h
+++ b/Source/WebCore/page/ContextMenuClient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,20 +23,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ContextMenuClient_h
-#define ContextMenuClient_h
+#pragma once
 
 #if ENABLE(CONTEXT_MENUS)
 
 #include "ContextMenu.h"
-#include "PlatformMenuDescription.h"
 #include <wtf/Forward.h>
-#include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
-    class ContextMenuItem;
+
     class Frame;
-    class HitTestResult;
     class URL;
 
     class ContextMenuClient {
@@ -44,14 +40,6 @@ namespace WebCore {
         virtual ~ContextMenuClient() {  }
         virtual void contextMenuDestroyed() = 0;
         
-#if USE(CROSS_PLATFORM_CONTEXT_MENUS)
-        virtual PassOwnPtr<ContextMenu> customizeMenu(PassOwnPtr<ContextMenu>) = 0;
-#else
-        virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) = 0;
-#endif
-
-        virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*) = 0;
-
         virtual void downloadURL(const URL& url) = 0;
         virtual void searchWithGoogle(const Frame*) = 0;
         virtual void lookUpInDictionary(Frame*) = 0;
@@ -59,7 +47,7 @@ namespace WebCore {
         virtual void speak(const String&) = 0;
         virtual void stopSpeaking() = 0;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
         virtual void searchWithSpotlight() = 0;
 #endif
 
@@ -67,7 +55,7 @@ namespace WebCore {
         virtual void showContextMenu() = 0;
 #endif
     };
-}
+
+} // namespace WebCore
 
 #endif // ENABLE(CONTEXT_MENUS)
-#endif