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 "webkit/plugins/ppapi/plugin_object.h" | 5 #include "webkit/plugins/ppapi/plugin_object.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/string_util.h" | |
11 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
12 #include "third_party/npapi/bindings/npapi.h" | 11 #include "base/strings/string_util.h" |
13 #include "third_party/npapi/bindings/npruntime.h" | |
14 #include "ppapi/c/dev/ppb_var_deprecated.h" | 12 #include "ppapi/c/dev/ppb_var_deprecated.h" |
15 #include "ppapi/c/dev/ppp_class_deprecated.h" | 13 #include "ppapi/c/dev/ppp_class_deprecated.h" |
16 #include "ppapi/c/pp_resource.h" | 14 #include "ppapi/c/pp_resource.h" |
17 #include "ppapi/c/pp_var.h" | 15 #include "ppapi/c/pp_var.h" |
18 #include "ppapi/shared_impl/ppapi_globals.h" | 16 #include "ppapi/shared_impl/ppapi_globals.h" |
19 #include "ppapi/shared_impl/resource_tracker.h" | 17 #include "ppapi/shared_impl/resource_tracker.h" |
20 #include "ppapi/shared_impl/var.h" | 18 #include "ppapi/shared_impl/var.h" |
21 #include "ppapi/shared_impl/var_tracker.h" | 19 #include "ppapi/shared_impl/var_tracker.h" |
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" |
| 21 #include "third_party/npapi/bindings/npapi.h" |
| 22 #include "third_party/npapi/bindings/npruntime.h" |
23 #include "webkit/plugins/ppapi/npapi_glue.h" | 23 #include "webkit/plugins/ppapi/npapi_glue.h" |
24 #include "webkit/plugins/ppapi/plugin_module.h" | 24 #include "webkit/plugins/ppapi/plugin_module.h" |
25 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" | 25 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
26 #include "webkit/plugins/ppapi/string.h" | 26 #include "webkit/plugins/ppapi/string.h" |
27 | 27 |
28 using ppapi::PpapiGlobals; | 28 using ppapi::PpapiGlobals; |
29 using ppapi::StringVar; | 29 using ppapi::StringVar; |
30 using ppapi::Var; | 30 using ppapi::Var; |
31 using WebKit::WebBindings; | 31 using WebKit::WebBindings; |
32 | 32 |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 // static | 352 // static |
353 NPObject* PluginObject::AllocateObjectWrapper() { | 353 NPObject* PluginObject::AllocateObjectWrapper() { |
354 NPObjectWrapper* wrapper = new NPObjectWrapper; | 354 NPObjectWrapper* wrapper = new NPObjectWrapper; |
355 memset(wrapper, 0, sizeof(NPObjectWrapper)); | 355 memset(wrapper, 0, sizeof(NPObjectWrapper)); |
356 return wrapper; | 356 return wrapper; |
357 } | 357 } |
358 | 358 |
359 } // namespace ppapi | 359 } // namespace ppapi |
360 } // namespace webkit | 360 } // namespace webkit |
361 | 361 |
OLD | NEW |