| Index: content/renderer/pepper/host_globals.h
|
| ===================================================================
|
| --- content/renderer/pepper/host_globals.h (revision 213482)
|
| +++ content/renderer/pepper/host_globals.h (working copy)
|
| @@ -2,16 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
|
| -#define WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
|
| +#ifndef CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
|
| +#define CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
|
|
|
| #include "base/compiler_specific.h"
|
| +#include "content/renderer/pepper/host_var_tracker.h"
|
| #include "ppapi/shared_impl/callback_tracker.h"
|
| #include "ppapi/shared_impl/ppapi_globals.h"
|
| #include "ppapi/shared_impl/resource_tracker.h"
|
| #include "ppapi/shared_impl/var_tracker.h"
|
| -#include "webkit/plugins/ppapi/host_var_tracker.h"
|
| -#include "webkit/plugins/webkit_plugins_export.h"
|
|
|
| namespace webkit {
|
| namespace ppapi {
|
| @@ -90,13 +89,13 @@
|
| // Returns a pointer to the plugin instance object associated with the given
|
| // instance handle. The return value will be NULL if the handle is invalid or
|
| // if the instance has crashed.
|
| - WEBKIT_PLUGINS_EXPORT PluginInstanceImpl* GetInstance(PP_Instance instance);
|
| + PluginInstanceImpl* GetInstance(PP_Instance instance);
|
|
|
| private:
|
| // PpapiGlobals overrides.
|
| virtual bool IsHostGlobals() const OVERRIDE;
|
|
|
| - WEBKIT_PLUGINS_EXPORT static HostGlobals* host_globals_;
|
| + static HostGlobals* host_globals_;
|
|
|
| ::ppapi::ResourceTracker resource_tracker_;
|
| HostVarTracker host_var_tracker_;
|
| @@ -116,4 +115,4 @@
|
| } // namespace ppapi
|
| } // namespace webkit
|
|
|
| -#endif // WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
|
| +#endif // CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_
|
|
|