From 51f825e6146c3e34ba97ad45875a599947459819 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Fri, 30 Oct 2009 21:04:27 +0000 Subject: Remove TemporaryGlue::popupsAllowed by just having the corresponding ChromiumBridge method return false. It turns out that NPP is always null in Chrome (due to out-of-process plugins), and as a result, we were always returning false anyways. R=jam BUG=none TEST=none Review URL: http://codereview.chromium.org/346026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30632 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/api/src/ChromiumBridge.cpp | 3 ++- webkit/api/src/TemporaryGlue.h | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'webkit/api') diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp index b0d5b0b..99495ca 100644 --- a/webkit/api/src/ChromiumBridge.cpp +++ b/webkit/api/src/ChromiumBridge.cpp @@ -664,7 +664,8 @@ IntRect ChromiumBridge::screenAvailableRect(Widget* widget) bool ChromiumBridge::popupsAllowed(NPP npp) { - return webKitClient()->popupsAllowed(npp); + // FIXME: Give the embedder a way to control this. + return false; } void ChromiumBridge::widgetSetCursor(Widget* widget, const Cursor& cursor) diff --git a/webkit/api/src/TemporaryGlue.h b/webkit/api/src/TemporaryGlue.h index 6352943..b5fbf85 100644 --- a/webkit/api/src/TemporaryGlue.h +++ b/webkit/api/src/TemporaryGlue.h @@ -35,10 +35,6 @@ // use to call to the Glue layer. Once the Glue layer moves entirely into the // WebKit layer, this file will be deleted. -struct _NPP; -typedef struct _NPP NPP_t; -typedef NPP_t* NPP; - namespace WebCore { class String; } @@ -47,7 +43,6 @@ namespace WebKit { class TemporaryGlue { public: virtual WebCore::String uiResourceProtocol() = 0; - virtual bool popupsAllowed(NPP) = 0; }; } // namespace WebKit -- cgit v1.1