summaryrefslogtreecommitdiffstats
path: root/webkit/api
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 21:04:27 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 21:04:27 +0000
commit51f825e6146c3e34ba97ad45875a599947459819 (patch)
tree47536418763864acfc0b616bc7ab74b5a02e6319 /webkit/api
parent0d3c28e8983a614e5858d4b84a6cfe479adb1312 (diff)
downloadchromium_src-51f825e6146c3e34ba97ad45875a599947459819.zip
chromium_src-51f825e6146c3e34ba97ad45875a599947459819.tar.gz
chromium_src-51f825e6146c3e34ba97ad45875a599947459819.tar.bz2
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
Diffstat (limited to 'webkit/api')
-rw-r--r--webkit/api/src/ChromiumBridge.cpp3
-rw-r--r--webkit/api/src/TemporaryGlue.h5
2 files changed, 2 insertions, 6 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