From c6dded1a060b3f3d623d2aeb1ba4c4607b29eda8 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 18:22:59 +0000 Subject: Merge webkit.org at r54127 : Keep ours for PlatformBridge. Change-Id: I19c5c5ea530813b6665c0d4beacae94be9d65d5d --- WebCore/platform/android/PlatformBridge.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'WebCore/platform/android/PlatformBridge.h') diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h index 644b504..5eb127f 100644 --- a/WebCore/platform/android/PlatformBridge.h +++ b/WebCore/platform/android/PlatformBridge.h @@ -81,10 +81,7 @@ class NPObject; namespace WebCore { -<<<<<<< HEAD class FrameView; -======= ->>>>>>> webkit.org at r54127 class Widget; // An interface to the embedding layer, which has the ability to answer @@ -108,7 +105,6 @@ public: static bool cookiesEnabled(); // Plugin static NPObject* pluginScriptableObject(Widget*); -<<<<<<< HEAD // Popups static bool popupsAllowed(NPP); @@ -131,8 +127,6 @@ public: // Whether the WebView is paused. static bool isWebViewPaused(); -======= ->>>>>>> webkit.org at r54127 }; } -- cgit v1.1