Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2312)

Unified Diff: chrome/plugin/npobject_stub.cc

Issue 6562: This fixes http://code.google.com/p/chromium/issues/detail?id=2472, which... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/plugin/npobject_stub.h ('k') | third_party/npapi/bindings/npruntime.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/plugin/npobject_stub.cc
===================================================================
--- chrome/plugin/npobject_stub.cc (revision 2981)
+++ chrome/plugin/npobject_stub.cc (working copy)
@@ -260,6 +260,7 @@
}
void NPObjectStub::OnEvaluate(const std::string& script,
+ bool popups_allowed,
IPC::Message* reply_msg) {
if (IsPluginProcess()) {
NOTREACHED() << "Should only be called on NPObjects in the renderer";
@@ -277,7 +278,8 @@
script_string.UTF8Characters = script.c_str();
script_string.UTF8Length = static_cast<unsigned int>(script.length());
- bool return_value = NPN_Evaluate(0, npobject_, &script_string, &result_var);
+ bool return_value = NPN_EvaluateHelper(0, popups_allowed, npobject_,
+ &script_string, &result_var);
NPVariant_Param result_param;
CreateNPVariantParam(result_var, local_channel, &result_param, true);
« no previous file with comments | « chrome/plugin/npobject_stub.h ('k') | third_party/npapi/bindings/npruntime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698