OLD | NEW |
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/common/npobject_stub.h" | 5 #include "content/common_child/npobject_stub.h" |
6 | 6 |
7 #include "content/common/np_channel_base.h" | 7 #include "content/common_child/np_channel_base.h" |
8 #include "content/common/npobject_util.h" | 8 #include "content/common_child/npobject_util.h" |
9 #include "content/common/plugin_messages.h" | 9 #include "content/common_child/plugin_messages.h" |
10 #include "content/public/common/content_client.h" | 10 #include "content/public/common/content_client.h" |
11 #include "content/public/common/content_switches.h" | 11 #include "content/public/common/content_switches.h" |
| 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" |
12 #include "third_party/npapi/bindings/npapi.h" | 13 #include "third_party/npapi/bindings/npapi.h" |
13 #include "third_party/npapi/bindings/npruntime.h" | 14 #include "third_party/npapi/bindings/npruntime.h" |
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" | |
15 #include "webkit/plugins/npapi/plugin_host.h" | 15 #include "webkit/plugins/npapi/plugin_host.h" |
16 | 16 |
17 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
18 #include "base/command_line.h" | 18 #include "base/command_line.h" |
19 #include "webkit/plugins/npapi/plugin_constants_win.h" | 19 #include "webkit/plugins/npapi/plugin_constants_win.h" |
20 #endif | 20 #endif |
21 | 21 |
22 using WebKit::WebBindings; | 22 using WebKit::WebBindings; |
23 | 23 |
24 namespace content { | 24 namespace content { |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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, channel_, &result_param, true, render_view_id_, page_url_); | 398 result_var, channel_, &result_param, true, render_view_id_, page_url_); |
399 NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value); | 399 NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value); |
400 channel_->Send(reply_msg); | 400 channel_->Send(reply_msg); |
401 } | 401 } |
402 | 402 |
403 } // namespace content | 403 } // namespace content |
OLD | NEW |