| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/renderer/webplugin_delegate_proxy.h" | 5 #include "chrome/renderer/webplugin_delegate_proxy.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 } | 267 } |
| 268 | 268 |
| 269 bool WebPluginDelegateProxy::Initialize( | 269 bool WebPluginDelegateProxy::Initialize( |
| 270 const GURL& url, | 270 const GURL& url, |
| 271 const std::vector<std::string>& arg_names, | 271 const std::vector<std::string>& arg_names, |
| 272 const std::vector<std::string>& arg_values, | 272 const std::vector<std::string>& arg_values, |
| 273 webkit::npapi::WebPlugin* plugin, | 273 webkit::npapi::WebPlugin* plugin, |
| 274 bool load_manually) { | 274 bool load_manually) { |
| 275 IPC::ChannelHandle channel_handle; | 275 IPC::ChannelHandle channel_handle; |
| 276 if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin( | 276 if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin( |
| 277 url, mime_type_, &channel_handle, &info_))) { | 277 render_view_->routing_id(), url, mime_type_, &channel_handle, |
| 278 &info_))) { |
| 278 return false; | 279 return false; |
| 279 } | 280 } |
| 280 | 281 |
| 281 if (channel_handle.name.empty()) { | 282 if (channel_handle.name.empty()) { |
| 282 // We got an invalid handle. Either the plugin couldn't be found (which | 283 // We got an invalid handle. Either the plugin couldn't be found (which |
| 283 // shouldn't happen, since if we got here the plugin should exist) or the | 284 // shouldn't happen, since if we got here the plugin should exist) or the |
| 284 // plugin crashed on initialization. | 285 // plugin crashed on initialization. |
| 285 if (!info_.path.empty()) { | 286 if (!info_.path.empty()) { |
| 286 render_view_->PluginCrashed(info_.path); | 287 render_view_->PluginCrashed(info_.path); |
| 287 | 288 |
| (...skipping 1271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1559 } | 1560 } |
| 1560 #endif | 1561 #endif |
| 1561 | 1562 |
| 1562 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow, | 1563 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow, |
| 1563 int resource_id) { | 1564 int resource_id) { |
| 1564 if (!plugin_) | 1565 if (!plugin_) |
| 1565 return; | 1566 return; |
| 1566 | 1567 |
| 1567 plugin_->URLRedirectResponse(allow, resource_id); | 1568 plugin_->URLRedirectResponse(allow, resource_id); |
| 1568 } | 1569 } |
| OLD | NEW |