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

Side by Side Diff: content/plugin/npobject_stub.cc

Issue 6672048: Move plugin code to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 9 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/plugin/npobject_stub.h ('k') | content/plugin/npobject_util.h » ('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 "chrome/plugin/npobject_stub.h" 5 #include "content/plugin/npobject_stub.h"
6 6
7 #include "chrome/plugin/npobject_util.h"
8 #include "chrome/plugin/plugin_channel_base.h"
9 #include "chrome/plugin/plugin_thread.h"
10 #include "content/common/content_client.h" 7 #include "content/common/content_client.h"
11 #include "content/common/plugin_messages.h" 8 #include "content/common/plugin_messages.h"
9 #include "content/plugin/npobject_util.h"
10 #include "content/plugin/plugin_channel_base.h"
11 #include "content/plugin/plugin_thread.h"
12 #include "third_party/npapi/bindings/npapi.h" 12 #include "third_party/npapi/bindings/npapi.h"
13 #include "third_party/npapi/bindings/npruntime.h" 13 #include "third_party/npapi/bindings/npruntime.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
15 #include "webkit/plugins/npapi/plugin_constants_win.h" 15 #include "webkit/plugins/npapi/plugin_constants_win.h"
16 16
17 using WebKit::WebBindings; 17 using WebKit::WebBindings;
18 18
19 NPObjectStub::NPObjectStub( 19 NPObjectStub::NPObjectStub(
20 NPObject* npobject, 20 NPObject* npobject,
21 PluginChannelBase* channel, 21 PluginChannelBase* channel,
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 bool return_value = WebBindings::evaluateHelper(0, popups_allowed, npobject_, 393 bool return_value = WebBindings::evaluateHelper(0, popups_allowed, npobject_,
394 &script_string, &result_var); 394 &script_string, &result_var);
395 395
396 NPVariant_Param result_param; 396 NPVariant_Param result_param;
397 CreateNPVariantParam( 397 CreateNPVariantParam(
398 result_var, local_channel, &result_param, true, containing_window_, 398 result_var, local_channel, &result_param, true, containing_window_,
399 page_url_); 399 page_url_);
400 NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value); 400 NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value);
401 local_channel->Send(reply_msg); 401 local_channel->Send(reply_msg);
402 } 402 }
OLDNEW
« no previous file with comments | « content/plugin/npobject_stub.h ('k') | content/plugin/npobject_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698