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_proxy.h" | 5 #include "content/common_child/npobject_proxy.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 "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" |
11 #include "webkit/glue/webkit_glue.h" | 11 #include "webkit/glue/webkit_glue.h" |
| 12 #include "webkit/plugins/npapi/plugin_host.h" |
12 #include "webkit/plugins/npapi/plugin_instance.h" | 13 #include "webkit/plugins/npapi/plugin_instance.h" |
13 #include "webkit/plugins/npapi/plugin_host.h" | |
14 | 14 |
15 using WebKit::WebBindings; | 15 using WebKit::WebBindings; |
16 | 16 |
17 namespace content { | 17 namespace content { |
18 | 18 |
19 struct NPObjectWrapper { | 19 struct NPObjectWrapper { |
20 NPObject object; | 20 NPObject object; |
21 NPObjectProxy* proxy; | 21 NPObjectProxy* proxy; |
22 }; | 22 }; |
23 | 23 |
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
492 proxy = NULL; | 492 proxy = NULL; |
493 if (!result) | 493 if (!result) |
494 return false; | 494 return false; |
495 | 495 |
496 CreateNPVariant( | 496 CreateNPVariant( |
497 result_param, channel.get(), result_var, render_view_id, page_url); | 497 result_param, channel.get(), result_var, render_view_id, page_url); |
498 return true; | 498 return true; |
499 } | 499 } |
500 | 500 |
501 } // namespace content | 501 } // namespace content |
OLD | NEW |