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

4 files changed, 2 insertions, 18 deletions

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
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 07cacbc..b04df0c 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -412,17 +412,6 @@ WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) {
 // Glue layer.  Once the Glue layer moves entirely into the WebKit layer, these
 // methods will be deleted.
 
-bool WebKitClientImpl::popupsAllowed(NPP npp) {
-  bool popups_allowed = false;
-  if (npp) {
-    NPAPI::PluginInstance* plugin_instance =
-        reinterpret_cast<NPAPI::PluginInstance*>(npp->ndata);
-    if (plugin_instance)
-      popups_allowed = plugin_instance->popups_allowed();
-  }
-  return popups_allowed;
-}
-
 WebCore::String WebKitClientImpl::uiResourceProtocol() {
   return StdStringToString(webkit_glue::GetUIResourceProtocol());
 }
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index f37e7ca..1eb9d8c 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -82,7 +82,6 @@ class WebKitClientImpl : public WebKit::WebKitClient {
   // Glue layer.  Once the Glue layer moves entirely into the WebKit layer,
   // these methods will be deleted.
   virtual WebCore::String uiResourceProtocol();
-  virtual bool popupsAllowed(NPP);
 
  private:
   void DoTimeout() {