Index: content/renderer/pepper/ppapi_plugin_instance_impl.cc |
=================================================================== |
--- content/renderer/pepper/ppapi_plugin_instance_impl.cc (revision 213482) |
+++ content/renderer/pepper/ppapi_plugin_instance_impl.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h" |
+#include "content/renderer/pepper/ppapi_plugin_instance_impl.h" |
#include "base/bind.h" |
#include "base/callback_helpers.h" |
@@ -16,6 +16,22 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "base/time/time.h" |
#include "cc/layers/texture_layer.h" |
+#include "content/renderer/pepper/common.h" |
+#include "content/renderer/pepper/content_decryptor_delegate.h" |
+#include "content/renderer/pepper/event_conversion.h" |
+#include "content/renderer/pepper/fullscreen_container.h" |
+#include "content/renderer/pepper/gfx_conversion.h" |
+#include "content/renderer/pepper/host_globals.h" |
+#include "content/renderer/pepper/message_channel.h" |
+#include "content/renderer/pepper/npapi_glue.h" |
+#include "content/renderer/pepper/plugin_module.h" |
+#include "content/renderer/pepper/plugin_object.h" |
+#include "content/renderer/pepper/ppb_buffer_impl.h" |
+#include "content/renderer/pepper/ppb_file_ref_impl.h" |
+#include "content/renderer/pepper/ppb_graphics_3d_impl.h" |
+#include "content/renderer/pepper/ppb_image_data_impl.h" |
+#include "content/renderer/pepper/ppp_pdf.h" |
+#include "content/renderer/pepper/url_request_info_util.h" |
#include "ppapi/c/dev/ppb_find_dev.h" |
#include "ppapi/c/dev/ppb_zoom_dev.h" |
#include "ppapi/c/dev/ppp_find_dev.h" |
@@ -78,22 +94,6 @@ |
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
#include "v8/include/v8.h" |
#include "webkit/plugins/plugin_constants.h" |
-#include "webkit/plugins/ppapi/common.h" |
-#include "webkit/plugins/ppapi/content_decryptor_delegate.h" |
-#include "webkit/plugins/ppapi/event_conversion.h" |
-#include "webkit/plugins/ppapi/fullscreen_container.h" |
-#include "webkit/plugins/ppapi/gfx_conversion.h" |
-#include "webkit/plugins/ppapi/host_globals.h" |
-#include "webkit/plugins/ppapi/message_channel.h" |
-#include "webkit/plugins/ppapi/npapi_glue.h" |
-#include "webkit/plugins/ppapi/plugin_module.h" |
-#include "webkit/plugins/ppapi/plugin_object.h" |
-#include "webkit/plugins/ppapi/ppb_buffer_impl.h" |
-#include "webkit/plugins/ppapi/ppb_file_ref_impl.h" |
-#include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h" |
-#include "webkit/plugins/ppapi/ppb_image_data_impl.h" |
-#include "webkit/plugins/ppapi/ppp_pdf.h" |
-#include "webkit/plugins/ppapi/url_request_info_util.h" |
#include "webkit/plugins/sad_plugin.h" |
#include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
@@ -381,6 +381,9 @@ |
delegate_(delegate) { |
} |
+PluginInstanceImpl::GamepadImpl::~GamepadImpl() { |
+} |
+ |
PPB_Gamepad_API* PluginInstanceImpl::GamepadImpl::AsPPB_Gamepad_API() { |
return this; |
} |