| Index: content/renderer/pepper/ppapi_webplugin_impl.h
|
| ===================================================================
|
| --- content/renderer/pepper/ppapi_webplugin_impl.h (revision 213482)
|
| +++ content/renderer/pepper/ppapi_webplugin_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_WEBPLUGIN_IMPL_H_
|
| -#define WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_
|
| +#ifndef CONTENT_RENDERER_PEPPER_PPAPI_WEBPLUGIN_IMPL_H_
|
| +#define CONTENT_RENDERER_PEPPER_PPAPI_WEBPLUGIN_IMPL_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -14,7 +14,6 @@
|
| #include "ppapi/c/pp_var.h"
|
| #include "third_party/WebKit/public/web/WebPlugin.h"
|
| #include "ui/gfx/rect.h"
|
| -#include "webkit/plugins/webkit_plugins_export.h"
|
|
|
| struct _NPP;
|
|
|
| @@ -37,11 +36,10 @@
|
|
|
| class WebPluginImpl : public WebKit::WebPlugin {
|
| public:
|
| - WEBKIT_PLUGINS_EXPORT WebPluginImpl(
|
| - PluginModule* module,
|
| - const WebKit::WebPluginParams& params,
|
| - const base::WeakPtr<PluginDelegate>& plugin_delegate,
|
| - const base::WeakPtr<content::RenderView>& render_view);
|
| + WebPluginImpl(PluginModule* module,
|
| + const WebKit::WebPluginParams& params,
|
| + const base::WeakPtr<PluginDelegate>& plugin_delegate,
|
| + const base::WeakPtr<content::RenderView>& render_view);
|
|
|
| PluginInstanceImpl* instance() { return instance_.get(); }
|
|
|
| @@ -96,7 +94,7 @@
|
| private:
|
| friend class base::DeleteHelper<WebPluginImpl>;
|
|
|
| - WEBKIT_PLUGINS_EXPORT virtual ~WebPluginImpl();
|
| + virtual ~WebPluginImpl();
|
| struct InitData;
|
|
|
| scoped_ptr<InitData> init_data_; // Cleared upon successful initialization.
|
| @@ -114,4 +112,4 @@
|
| } // namespace ppapi
|
| } // namespace webkit
|
|
|
| -#endif // WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_
|
| +#endif // CONTENT_RENDERER_PEPPER_PPAPI_WEBPLUGIN_IMPL_H_
|
|
|