| Index: content/renderer/pepper/ppapi_plugin_instance_impl.h
|
| ===================================================================
|
| --- content/renderer/pepper/ppapi_plugin_instance_impl.h (revision 213482)
|
| +++ content/renderer/pepper/ppapi_plugin_instance_impl.h (working copy)
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_IMPL_H_
|
| -#define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_IMPL_H_
|
| +#ifndef CONTENT_RENDERER_PEPPER_PPAPI_PLUGIN_INSTANCE_IMPL_H_
|
| +#define CONTENT_RENDERER_PEPPER_PPAPI_PLUGIN_INSTANCE_IMPL_H_
|
|
|
| #include <set>
|
| #include <string>
|
| @@ -15,6 +15,10 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "cc/layers/texture_layer_client.h"
|
| +#include "content/common/content_export.h"
|
| +#include "content/public/renderer/ppapi_plugin_instance.h"
|
| +#include "content/renderer/pepper/plugin_delegate.h"
|
| +#include "content/renderer/pepper/ppp_pdf.h"
|
| #include "ppapi/c/dev/pp_cursor_type_dev.h"
|
| #include "ppapi/c/dev/ppp_find_dev.h"
|
| #include "ppapi/c/dev/ppp_printing_dev.h"
|
| @@ -50,10 +54,6 @@
|
| #include "ui/base/ime/text_input_type.h"
|
| #include "ui/gfx/rect.h"
|
| #include "url/gurl.h"
|
| -#include "webkit/plugins/ppapi/plugin_delegate.h"
|
| -#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
|
| -#include "webkit/plugins/ppapi/ppp_pdf.h"
|
| -#include "webkit/plugins/webkit_plugins_export.h"
|
|
|
| struct PP_Point;
|
| struct _NPP;
|
| @@ -109,21 +109,22 @@
|
| //
|
| // Note: to get from a PP_Instance to a PluginInstance*, use the
|
| // ResourceTracker.
|
| -class WEBKIT_PLUGINS_EXPORT PluginInstanceImpl :
|
| - public base::RefCounted<PluginInstanceImpl>,
|
| - public base::SupportsWeakPtr<PluginInstanceImpl>,
|
| - public NON_EXPORTED_BASE(PluginInstance),
|
| - public ::ppapi::PPB_Instance_Shared {
|
| +class CONTENT_EXPORT PluginInstanceImpl
|
| + : public base::RefCounted<PluginInstanceImpl>,
|
| + public base::SupportsWeakPtr<PluginInstanceImpl>,
|
| + public NON_EXPORTED_BASE(PluginInstance),
|
| + public ::ppapi::PPB_Instance_Shared {
|
| public:
|
| // Create and return a PluginInstanceImpl object which supports the most
|
| // recent version of PPP_Instance possible by querying the given
|
| // get_plugin_interface function. If the plugin does not support any valid
|
| // PPP_Instance interface, returns NULL.
|
| - static PluginInstanceImpl* Create(PluginDelegate* delegate,
|
| - content::RenderView* render_view,
|
| - PluginModule* module,
|
| - WebKit::WebPluginContainer* container,
|
| - const GURL& plugin_url);
|
| + static PluginInstanceImpl* Create(
|
| + PluginDelegate* delegate,
|
| + content::RenderView* render_view,
|
| + PluginModule* module,
|
| + WebKit::WebPluginContainer* container,
|
| + const GURL& plugin_url);
|
| // Delete should be called by the WebPlugin before this destructor.
|
| virtual ~PluginInstanceImpl();
|
|
|
| @@ -858,4 +859,4 @@
|
| } // namespace ppapi
|
| } // namespace webkit
|
|
|
| -#endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_IMPL_H_
|
| +#endif // CONTENT_RENDERER_PEPPER_PPAPI_PLUGIN_INSTANCE_IMPL_H_
|
|
|