diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 20:16:38 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 20:16:38 +0000 |
| commit | ce185864d3ef3d2a3fd40ae93300a5858f961c94 (patch) | |
| tree | c8a6e9f9fc755f872cdc1f384148296a81bfc501 /chrome/plugin/npobject_util.cc | |
| parent | 09f83fa89c9ab23b5f9623b06f1322850d21a15a (diff) | |
| download | chromium_src-ce185864d3ef3d2a3fd40ae93300a5858f961c94.zip chromium_src-ce185864d3ef3d2a3fd40ae93300a5858f961c94.tar.gz chromium_src-ce185864d3ef3d2a3fd40ae93300a5858f961c94.tar.bz2 | |
Revert change 20173 because it breaks the ui_tests, plugin_tests
and most likely some page cyclers.
Review URL: http://codereview.chromium.org/155236
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/npobject_util.cc')
| -rw-r--r-- | chrome/plugin/npobject_util.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/plugin/npobject_util.cc b/chrome/plugin/npobject_util.cc index ecf5606..ececfa2 100644 --- a/chrome/plugin/npobject_util.cc +++ b/chrome/plugin/npobject_util.cc @@ -138,8 +138,7 @@ void CreateNPVariantParam(const NPVariant& variant, PluginChannelBase* channel, NPVariant_Param* param, bool release, - base::WaitableEvent* modal_dialog_event, - const GURL& page_url) { + base::WaitableEvent* modal_dialog_event) { switch (variant.type) { case NPVariantType_Void: param->type = NPVARIANT_PARAM_VOID; @@ -184,8 +183,7 @@ void CreateNPVariantParam(const NPVariant& variant, param->type = NPVARIANT_PARAM_OBJECT_ROUTING_ID; int route_id = channel->GenerateRouteID(); new NPObjectStub( - variant.value.objectValue, channel, route_id, modal_dialog_event, - page_url); + variant.value.objectValue, channel, route_id, modal_dialog_event); param->npobject_routing_id = route_id; param->npobject_pointer = reinterpret_cast<intptr_t>(variant.value.objectValue); @@ -206,8 +204,7 @@ void CreateNPVariantParam(const NPVariant& variant, void CreateNPVariant(const NPVariant_Param& param, PluginChannelBase* channel, NPVariant* result, - base::WaitableEvent* modal_dialog_event, - const GURL& page_url) { + base::WaitableEvent* modal_dialog_event) { switch (param.type) { case NPVARIANT_PARAM_VOID: result->type = NPVariantType_Void; @@ -240,8 +237,7 @@ void CreateNPVariant(const NPVariant_Param& param, NPObjectProxy::Create(channel, param.npobject_routing_id, param.npobject_pointer, - modal_dialog_event, - page_url); + modal_dialog_event); break; case NPVARIANT_PARAM_OBJECT_POINTER: result->type = NPVariantType_Object; |