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

Side by Side Diff: content/renderer/webplugin_delegate_proxy.cc

Issue 7387010: Add PluginServiceFilter interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view.cc ('k') | webkit/plugins/npapi/plugin_list.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/renderer/webplugin_delegate_proxy.h" 5 #include "content/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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 #endif 276 #endif
277 277
278 bool WebPluginDelegateProxy::Initialize( 278 bool WebPluginDelegateProxy::Initialize(
279 const GURL& url, 279 const GURL& url,
280 const std::vector<std::string>& arg_names, 280 const std::vector<std::string>& arg_names,
281 const std::vector<std::string>& arg_values, 281 const std::vector<std::string>& arg_values,
282 webkit::npapi::WebPlugin* plugin, 282 webkit::npapi::WebPlugin* plugin,
283 bool load_manually) { 283 bool load_manually) {
284 IPC::ChannelHandle channel_handle; 284 IPC::ChannelHandle channel_handle;
285 if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin( 285 if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
286 render_view_->routing_id(), url, mime_type_, &channel_handle, 286 render_view_->routing_id(), url, page_url_, mime_type_,
287 &info_))) { 287 &channel_handle, &info_))) {
288 return false; 288 return false;
289 } 289 }
290 290
291 if (channel_handle.name.empty()) { 291 if (channel_handle.name.empty()) {
292 // We got an invalid handle. Either the plugin couldn't be found (which 292 // We got an invalid handle. Either the plugin couldn't be found (which
293 // shouldn't happen, since if we got here the plugin should exist) or the 293 // shouldn't happen, since if we got here the plugin should exist) or the
294 // plugin crashed on initialization. 294 // plugin crashed on initialization.
295 if (!info_.path.empty()) { 295 if (!info_.path.empty()) {
296 render_view_->PluginCrashed(info_.path); 296 render_view_->PluginCrashed(info_.path);
297 297
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 } 1388 }
1389 #endif 1389 #endif
1390 1390
1391 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow, 1391 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
1392 int resource_id) { 1392 int resource_id) {
1393 if (!plugin_) 1393 if (!plugin_)
1394 return; 1394 return;
1395 1395
1396 plugin_->URLRedirectResponse(allow, resource_id); 1396 plugin_->URLRedirectResponse(allow, resource_id);
1397 } 1397 }
OLDNEW
« no previous file with comments | « content/renderer/render_view.cc ('k') | webkit/plugins/npapi/plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698