summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 08:04:07 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 08:04:07 +0000
commit0a6d5f653ade694a78328b7949672eceaa2daa01 (patch)
tree5e0c8e2a1f2e0c24449873016c32bfe216b38afb /ppapi/proxy
parent067e733f46069691d9c7991b560d6678eebf7896 (diff)
downloadchromium_src-0a6d5f653ade694a78328b7949672eceaa2daa01.zip
chromium_src-0a6d5f653ade694a78328b7949672eceaa2daa01.tar.gz
chromium_src-0a6d5f653ade694a78328b7949672eceaa2daa01.tar.bz2
Cleanup: Remove unneeded forward declarations in ppapi.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8527020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/dispatcher.h2
-rw-r--r--ppapi/proxy/enter_proxy.h8
-rw-r--r--ppapi/proxy/host_dispatcher.h13
-rw-r--r--ppapi/proxy/host_var_serialization_rules.h4
-rw-r--r--ppapi/proxy/plugin_dispatcher.h8
-rw-r--r--ppapi/proxy/plugin_resource_tracker.h4
-rw-r--r--ppapi/proxy/plugin_var_tracker.h2
-rw-r--r--ppapi/proxy/ppapi_param_traits.h1
-rw-r--r--ppapi/proxy/ppb_broker_proxy.h10
-rw-r--r--ppapi/proxy/ppb_buffer_proxy.h10
-rw-r--r--ppapi/proxy/ppb_context_3d_proxy.h5
-rw-r--r--ppapi/proxy/ppb_cursor_control_proxy.h10
-rw-r--r--ppapi/proxy/ppb_file_chooser_proxy.h7
-rw-r--r--ppapi/proxy/ppb_file_ref_proxy.h4
-rw-r--r--ppapi/proxy/ppb_file_system_proxy.h4
-rw-r--r--ppapi/proxy/ppb_flash_proxy.h9
-rw-r--r--ppapi/proxy/ppb_font_proxy.h6
-rw-r--r--ppapi/proxy/ppb_surface_3d_proxy.h10
-rw-r--r--ppapi/proxy/ppb_text_input_proxy.h10
-rw-r--r--ppapi/proxy/ppb_var_deprecated_proxy.h9
-rw-r--r--ppapi/proxy/ppb_video_capture_proxy.h13
-rw-r--r--ppapi/proxy/ppp_class_proxy.h3
-rw-r--r--ppapi/proxy/ppp_instance_proxy.h4
-rw-r--r--ppapi/proxy/proxy_channel.h4
-rw-r--r--ppapi/proxy/proxy_module.h2
25 files changed, 50 insertions, 112 deletions
diff --git a/ppapi/proxy/dispatcher.h b/ppapi/proxy/dispatcher.h
index 988f53d..a4a8f06 100644
--- a/ppapi/proxy/dispatcher.h
+++ b/ppapi/proxy/dispatcher.h
@@ -22,8 +22,6 @@
namespace ppapi {
-class WebKitForwarding;
-
namespace proxy {
class VarSerializationRules;
diff --git a/ppapi/proxy/enter_proxy.h b/ppapi/proxy/enter_proxy.h
index 3f819ba..5306a80 100644
--- a/ppapi/proxy/enter_proxy.h
+++ b/ppapi/proxy/enter_proxy.h
@@ -15,10 +15,6 @@
namespace ppapi {
-namespace thunk {
-class ResourceCreationAPI;
-}
-
namespace proxy {
// Wrapper around EnterResourceNoLock that takes a host resource. This is used
@@ -31,7 +27,7 @@ template<typename ResourceT>
class EnterPluginFromHostResource
: public thunk::EnterResourceNoLock<ResourceT> {
public:
- EnterPluginFromHostResource(const HostResource& host_resource)
+ explicit EnterPluginFromHostResource(const HostResource& host_resource)
: thunk::EnterResourceNoLock<ResourceT>(
PluginGlobals::Get()->plugin_resource_tracker()->
PluginResourceForHostResource(host_resource),
@@ -48,7 +44,7 @@ template<typename ResourceT>
class EnterHostFromHostResource
: public thunk::EnterResourceNoLock<ResourceT> {
public:
- EnterHostFromHostResource(const HostResource& host_resource)
+ explicit EnterHostFromHostResource(const HostResource& host_resource)
: thunk::EnterResourceNoLock<ResourceT>(
host_resource.host_resource(), false) {
// Validate that we're in the host rather than the plugin. Otherwise this
diff --git a/ppapi/proxy/host_dispatcher.h b/ppapi/proxy/host_dispatcher.h
index 10fca5c..31de206 100644
--- a/ppapi/proxy/host_dispatcher.h
+++ b/ppapi/proxy/host_dispatcher.h
@@ -16,15 +16,6 @@
#include "ppapi/shared_impl/function_group_base.h"
struct PPB_Proxy_Private;
-struct PPB_Var_Deprecated;
-
-namespace base {
-class WaitableEvent;
-}
-
-namespace IPC {
-class SyncChannel;
-}
namespace ppapi {
@@ -32,8 +23,6 @@ struct Preferences;
namespace proxy {
-class VarSerialization;
-
class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher {
public:
// Constructor for the renderer side.
@@ -124,7 +113,7 @@ class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher {
// since that's what most callers have.
class ScopedModuleReference {
public:
- ScopedModuleReference(Dispatcher* dispatcher);
+ explicit ScopedModuleReference(Dispatcher* dispatcher);
~ScopedModuleReference();
private:
diff --git a/ppapi/proxy/host_var_serialization_rules.h b/ppapi/proxy/host_var_serialization_rules.h
index 478a872..70e9a7b 100644
--- a/ppapi/proxy/host_var_serialization_rules.h
+++ b/ppapi/proxy/host_var_serialization_rules.h
@@ -5,6 +5,8 @@
#ifndef PPAPI_PROXY_HOST_VAR_SERIALIZATION_RULES_H_
#define PPAPI_PROXY_HOST_VAR_SERIALIZATION_RULES_H_
+#include <string>
+
#include "base/basictypes.h"
#include "ppapi/c/pp_module.h"
#include "ppapi/proxy/var_serialization_rules.h"
@@ -14,8 +16,6 @@ struct PPB_Var;
namespace ppapi {
namespace proxy {
-class VarTracker;
-
// Implementation of the VarSerializationRules interface for the host side.
class HostVarSerializationRules : public VarSerializationRules {
public:
diff --git a/ppapi/proxy/plugin_dispatcher.h b/ppapi/proxy/plugin_dispatcher.h
index b16484c..fcfacfb 100644
--- a/ppapi/proxy/plugin_dispatcher.h
+++ b/ppapi/proxy/plugin_dispatcher.h
@@ -5,6 +5,7 @@
#ifndef PPAPI_PROXY_PLUGIN_DISPATCHER_H_
#define PPAPI_PROXY_PLUGIN_DISPATCHER_H_
+#include <set>
#include <string>
#include "base/basictypes.h"
@@ -18,16 +19,11 @@
#include "ppapi/shared_impl/function_group_base.h"
#include "ppapi/shared_impl/ppapi_preferences.h"
-class MessageLoop;
-
-namespace base {
-class WaitableEvent;
-}
-
namespace ppapi {
struct Preferences;
class Resource;
+class WebKitForwarding;
namespace proxy {
diff --git a/ppapi/proxy/plugin_resource_tracker.h b/ppapi/proxy/plugin_resource_tracker.h
index b87c6f8..35c2385 100644
--- a/ppapi/proxy/plugin_resource_tracker.h
+++ b/ppapi/proxy/plugin_resource_tracker.h
@@ -23,12 +23,8 @@ template<typename T> struct DefaultSingletonTraits;
namespace ppapi {
-class Var;
-
namespace proxy {
-class PluginDispatcher;
-
class PPAPI_PROXY_EXPORT PluginResourceTracker : public ResourceTracker {
public:
PluginResourceTracker();
diff --git a/ppapi/proxy/plugin_var_tracker.h b/ppapi/proxy/plugin_var_tracker.h
index 405b03f..b6bb893 100644
--- a/ppapi/proxy/plugin_var_tracker.h
+++ b/ppapi/proxy/plugin_var_tracker.h
@@ -16,8 +16,6 @@
#include "ppapi/proxy/ppapi_proxy_export.h"
#include "ppapi/shared_impl/var_tracker.h"
-struct PPB_Var;
-
template<typename T> struct DefaultSingletonTraits;
namespace ppapi {
diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h
index 83d2988..4787dca 100644
--- a/ppapi/proxy/ppapi_param_traits.h
+++ b/ppapi/proxy/ppapi_param_traits.h
@@ -18,7 +18,6 @@
struct PP_FileInfo;
struct PP_ObjectProperty;
-struct PP_Flash_Menu;
struct PP_NetAddress_Private;
namespace ppapi {
diff --git a/ppapi/proxy/ppb_broker_proxy.h b/ppapi/proxy/ppb_broker_proxy.h
index 572cf79..d2f039a 100644
--- a/ppapi/proxy/ppb_broker_proxy.h
+++ b/ppapi/proxy/ppb_broker_proxy.h
@@ -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 PPAPI_PPB_BROKER_PROXY_H_
-#define PPAPI_PPB_BROKER_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_BROKER_PROXY_H_
+#define PPAPI_PROXY_PPB_BROKER_PROXY_H_
#include "base/sync_socket.h"
#include "ipc/ipc_platform_file.h"
@@ -12,8 +12,6 @@
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
-struct PPB_BrokerTrusted;
-
namespace ppapi {
class HostResource;
@@ -22,7 +20,7 @@ namespace proxy {
class PPB_Broker_Proxy : public InterfaceProxy {
public:
- PPB_Broker_Proxy(Dispatcher* dispatcher);
+ explicit PPB_Broker_Proxy(Dispatcher* dispatcher);
virtual ~PPB_Broker_Proxy();
static PP_Resource CreateProxyResource(PP_Instance instance);
@@ -50,4 +48,4 @@ class PPB_Broker_Proxy : public InterfaceProxy {
} // namespace proxy
} // namespace ppapi
-#endif // PPAPI_PPB_BROKER_PROXY_H_
+#endif // PPAPI_PROXY_PPB_BROKER_PROXY_H_
diff --git a/ppapi/proxy/ppb_buffer_proxy.h b/ppapi/proxy/ppb_buffer_proxy.h
index 9b39c2c..08a2753 100644
--- a/ppapi/proxy/ppb_buffer_proxy.h
+++ b/ppapi/proxy/ppb_buffer_proxy.h
@@ -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 PPAPI_PPB_BUFFER_PROXY_H_
-#define PPAPI_PPB_BUFFER_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_BUFFER_PROXY_H_
+#define PPAPI_PROXY_PPB_BUFFER_PROXY_H_
#include "base/shared_memory.h"
#include "ppapi/c/pp_instance.h"
@@ -11,8 +11,6 @@
#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/ppb_buffer_api.h"
-struct PPB_Buffer_Dev;
-
namespace ppapi {
class HostResource;
@@ -46,7 +44,7 @@ class Buffer : public thunk::PPB_Buffer_API, public Resource {
class PPB_Buffer_Proxy : public InterfaceProxy {
public:
- PPB_Buffer_Proxy(Dispatcher* dispatcher);
+ explicit PPB_Buffer_Proxy(Dispatcher* dispatcher);
virtual ~PPB_Buffer_Proxy();
static PP_Resource CreateProxyResource(PP_Instance instance,
@@ -71,4 +69,4 @@ class PPB_Buffer_Proxy : public InterfaceProxy {
} // namespace proxy
} // namespace ppapi
-#endif // PPAPI_PPB_BUFFER_PROXY_H_
+#endif // PPAPI_PROXY_PPB_BUFFER_PROXY_H_
diff --git a/ppapi/proxy/ppb_context_3d_proxy.h b/ppapi/proxy/ppb_context_3d_proxy.h
index 2fb52c6..4747b4b 100644
--- a/ppapi/proxy/ppb_context_3d_proxy.h
+++ b/ppapi/proxy/ppb_context_3d_proxy.h
@@ -17,9 +17,6 @@
#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/ppb_context_3d_api.h"
-struct PPB_Context3D_Dev;
-struct PPB_Context3DTrusted_Dev;
-
namespace gpu {
class CommandBuffer;
@@ -94,7 +91,7 @@ class Context3D : public Resource, public thunk::PPB_Context3D_API {
class PPB_Context3D_Proxy : public InterfaceProxy {
public:
- PPB_Context3D_Proxy(Dispatcher* dispatcher);
+ explicit PPB_Context3D_Proxy(Dispatcher* dispatcher);
virtual ~PPB_Context3D_Proxy();
static PP_Resource Create(PP_Instance instance,
diff --git a/ppapi/proxy/ppb_cursor_control_proxy.h b/ppapi/proxy/ppb_cursor_control_proxy.h
index 5e9cfa8..f2d3e2c 100644
--- a/ppapi/proxy/ppb_cursor_control_proxy.h
+++ b/ppapi/proxy/ppb_cursor_control_proxy.h
@@ -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 PPAPI_PPB_CURSOR_CONTROL_PROXY_H_
-#define PPAPI_PPB_CURSOR_CONTROL_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_CURSOR_CONTROL_PROXY_H_
+#define PPAPI_PROXY_PPB_CURSOR_CONTROL_PROXY_H_
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_bool.h"
@@ -15,8 +15,6 @@
#include "ppapi/shared_impl/host_resource.h"
#include "ppapi/thunk/ppb_cursor_control_api.h"
-struct PPB_CursorControl_Dev;
-
namespace ppapi {
namespace proxy {
@@ -24,7 +22,7 @@ class PPB_CursorControl_Proxy
: public InterfaceProxy,
public ppapi::thunk::PPB_CursorControl_FunctionAPI {
public:
- PPB_CursorControl_Proxy(Dispatcher* dispatcher);
+ explicit PPB_CursorControl_Proxy(Dispatcher* dispatcher);
virtual ~PPB_CursorControl_Proxy();
// FunctionGroupBase overrides.
@@ -66,4 +64,4 @@ class PPB_CursorControl_Proxy
} // namespace proxy
} // namespace ppapi
-#endif // PPAPI_PPB_CURSOR_CONTROL_PROXY_H_
+#endif // PPAPI_PROXY_PPB_CURSOR_CONTROL_PROXY_H_
diff --git a/ppapi/proxy/ppb_file_chooser_proxy.h b/ppapi/proxy/ppb_file_chooser_proxy.h
index 1256cd3..887a32b 100644
--- a/ppapi/proxy/ppb_file_chooser_proxy.h
+++ b/ppapi/proxy/ppb_file_chooser_proxy.h
@@ -15,9 +15,6 @@
#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
#include "ppapi/thunk/ppb_file_chooser_api.h"
-struct PPB_FileChooser_Dev;
-struct PPB_FileChooserTrusted;
-
namespace ppapi {
class HostResource;
@@ -25,11 +22,9 @@ struct PPB_FileRef_CreateInfo;
namespace proxy {
-class SerializedVarReceiveInput;
-
class PPB_FileChooser_Proxy : public InterfaceProxy {
public:
- PPB_FileChooser_Proxy(Dispatcher* dispatcher);
+ explicit PPB_FileChooser_Proxy(Dispatcher* dispatcher);
virtual ~PPB_FileChooser_Proxy();
static const Info* GetTrustedInfo();
diff --git a/ppapi/proxy/ppb_file_ref_proxy.h b/ppapi/proxy/ppb_file_ref_proxy.h
index 07549c4..83fee18 100644
--- a/ppapi/proxy/ppb_file_ref_proxy.h
+++ b/ppapi/proxy/ppb_file_ref_proxy.h
@@ -15,8 +15,6 @@
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
-struct PPB_FileRef_Dev;
-
namespace ppapi {
class HostResource;
@@ -26,7 +24,7 @@ namespace proxy {
class PPB_FileRef_Proxy : public InterfaceProxy {
public:
- PPB_FileRef_Proxy(Dispatcher* dispatcher);
+ explicit PPB_FileRef_Proxy(Dispatcher* dispatcher);
virtual ~PPB_FileRef_Proxy();
static PP_Resource CreateProxyResource(PP_Resource file_system,
diff --git a/ppapi/proxy/ppb_file_system_proxy.h b/ppapi/proxy/ppb_file_system_proxy.h
index 07e3929..a07b824 100644
--- a/ppapi/proxy/ppb_file_system_proxy.h
+++ b/ppapi/proxy/ppb_file_system_proxy.h
@@ -16,8 +16,6 @@
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
-struct PPB_FileSystem_Dev;
-
namespace ppapi {
class HostResource;
@@ -26,7 +24,7 @@ namespace proxy {
class PPB_FileSystem_Proxy : public InterfaceProxy {
public:
- PPB_FileSystem_Proxy(Dispatcher* dispatcher);
+ explicit PPB_FileSystem_Proxy(Dispatcher* dispatcher);
virtual ~PPB_FileSystem_Proxy();
static const Info* GetInfo();
diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h
index 2d224bd..8151d23 100644
--- a/ppapi/proxy/ppb_flash_proxy.h
+++ b/ppapi/proxy/ppb_flash_proxy.h
@@ -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 PPAPI_PPB_FLASH_PROXY_H_
-#define PPAPI_PPB_FLASH_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_FLASH_PROXY_H_
+#define PPAPI_PROXY_PPB_FLASH_PROXY_H_
#include <string>
#include <vector>
@@ -15,7 +15,6 @@
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/shared_impl/host_resource.h"
-struct PP_FileInfo;
struct PPB_Flash;
namespace ppapi {
@@ -29,7 +28,7 @@ class SerializedVarReturnValue;
class PPB_Flash_Proxy : public InterfaceProxy {
public:
- PPB_Flash_Proxy(Dispatcher* dispatcher);
+ explicit PPB_Flash_Proxy(Dispatcher* dispatcher);
virtual ~PPB_Flash_Proxy();
static const PPB_Flash* GetInterface();
@@ -67,4 +66,4 @@ class PPB_Flash_Proxy : public InterfaceProxy {
} // namespace proxy
} // namespace ppapi
-#endif // PPAPI_PPB_FLASH_PROXY_H_
+#endif // PPAPI_PROXY_PPB_FLASH_PROXY_H_
diff --git a/ppapi/proxy/ppb_font_proxy.h b/ppapi/proxy/ppb_font_proxy.h
index 9deb31f..136e509 100644
--- a/ppapi/proxy/ppb_font_proxy.h
+++ b/ppapi/proxy/ppb_font_proxy.h
@@ -14,17 +14,13 @@
#include "ppapi/shared_impl/webkit_forwarding.h"
#include "ppapi/thunk/ppb_font_api.h"
-struct PPB_Font_Dev;
-
namespace ppapi {
namespace proxy {
-class SerializedVarReturnValue;
-
class PPB_Font_Proxy : public InterfaceProxy,
public ppapi::thunk::PPB_Font_FunctionAPI {
public:
- PPB_Font_Proxy(Dispatcher* dispatcher);
+ explicit PPB_Font_Proxy(Dispatcher* dispatcher);
virtual ~PPB_Font_Proxy();
// FunctionGroupBase overrides.
diff --git a/ppapi/proxy/ppb_surface_3d_proxy.h b/ppapi/proxy/ppb_surface_3d_proxy.h
index cf47888..b9d053d 100644
--- a/ppapi/proxy/ppb_surface_3d_proxy.h
+++ b/ppapi/proxy/ppb_surface_3d_proxy.h
@@ -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 PPAPI_PPB_SURFACE_3D_PROXY_H_
-#define PPAPI_PPB_SURFACE_3D_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_SURFACE_3D_PROXY_H_
+#define PPAPI_PROXY_PPB_SURFACE_3D_PROXY_H_
#include <vector>
@@ -16,8 +16,6 @@
#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/ppb_surface_3d_api.h"
-struct PPB_Surface3D_Dev;
-
namespace ppapi {
namespace proxy {
@@ -63,7 +61,7 @@ class Surface3D : public ppapi::Resource,
class PPB_Surface3D_Proxy : public InterfaceProxy {
public:
- PPB_Surface3D_Proxy(Dispatcher* dispatcher);
+ explicit PPB_Surface3D_Proxy(Dispatcher* dispatcher);
virtual ~PPB_Surface3D_Proxy();
static const Info* GetInfo();
@@ -98,4 +96,4 @@ class PPB_Surface3D_Proxy : public InterfaceProxy {
} // namespace proxy
} // namespace ppapi
-#endif // PPAPI_PPB_SURFACE_3D_PROXY_H_
+#endif // PPAPI_PROXY_PPB_SURFACE_3D_PROXY_H_
diff --git a/ppapi/proxy/ppb_text_input_proxy.h b/ppapi/proxy/ppb_text_input_proxy.h
index d692ea3..92a8b12 100644
--- a/ppapi/proxy/ppb_text_input_proxy.h
+++ b/ppapi/proxy/ppb_text_input_proxy.h
@@ -2,16 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PPAPI_PPB_TEXT_INPUT_PROXY_H_
-#define PPAPI_PPB_TEXT_INPUT_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_TEXT_INPUT_PROXY_H_
+#define PPAPI_PROXY_PPB_TEXT_INPUT_PROXY_H_
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_rect.h"
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/thunk/ppb_text_input_api.h"
-struct PPB_TextInput_Dev;
-
namespace ppapi {
namespace proxy {
@@ -19,7 +17,7 @@ class PPB_TextInput_Proxy
: public InterfaceProxy,
public ppapi::thunk::PPB_TextInput_FunctionAPI {
public:
- PPB_TextInput_Proxy(Dispatcher* dispatcher);
+ explicit PPB_TextInput_Proxy(Dispatcher* dispatcher);
virtual ~PPB_TextInput_Proxy();
// FunctionGroupBase overrides.
@@ -53,4 +51,4 @@ class PPB_TextInput_Proxy
} // namespace proxy
} // namespace ppapi
-#endif // PPAPI_PPB_TEXT_INPUT_PROXY_H_
+#endif // PPAPI_PROXY_PPB_TEXT_INPUT_PROXY_H_
diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.h b/ppapi/proxy/ppb_var_deprecated_proxy.h
index 1eb62c6..5e6efd3 100644
--- a/ppapi/proxy/ppb_var_deprecated_proxy.h
+++ b/ppapi/proxy/ppb_var_deprecated_proxy.h
@@ -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 PPAPI_PPB_VAR_DEPRECATED_PROXY_H_
-#define PPAPI_PPB_VAR_DEPRECATED_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_VAR_DEPRECATED_PROXY_H_
+#define PPAPI_PROXY_PPB_VAR_DEPRECATED_PROXY_H_
#include <vector>
@@ -17,7 +17,6 @@ namespace ppapi {
namespace proxy {
class SerializedVar;
-class SerializedVarArray;
class SerializedVarReceiveInput;
class SerializedVarVectorOutParam;
class SerializedVarVectorReceiveInput;
@@ -26,7 +25,7 @@ class SerializedVarReturnValue;
class PPB_Var_Deprecated_Proxy : public InterfaceProxy {
public:
- PPB_Var_Deprecated_Proxy(Dispatcher* dispatcher);
+ explicit PPB_Var_Deprecated_Proxy(Dispatcher* dispatcher);
virtual ~PPB_Var_Deprecated_Proxy();
static const Info* GetInfo();
@@ -100,4 +99,4 @@ class PPB_Var_Deprecated_Proxy : public InterfaceProxy {
} // namespace proxy
} // namespace ppapi
-#endif // PPAPI_PPB_VAR_DEPRECATED_PROXY_H_
+#endif // PPAPI_PROXY_PPB_VAR_DEPRECATED_PROXY_H_
diff --git a/ppapi/proxy/ppb_video_capture_proxy.h b/ppapi/proxy/ppb_video_capture_proxy.h
index e72899a..77295c7d 100644
--- a/ppapi/proxy/ppb_video_capture_proxy.h
+++ b/ppapi/proxy/ppb_video_capture_proxy.h
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef PPAPI_PPB_VIDEO_CAPTURE_PROXY_H_
-#define PPAPI_PPB_VIDEO_CAPTURE_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_VIDEO_CAPTURE_PROXY_H_
+#define PPAPI_PROXY_PPB_VIDEO_CAPTURE_PROXY_H_
+
+#include <vector>
#include "ppapi/c/pp_instance.h"
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/serialized_structs.h"
-struct PPB_VideoCapture_Dev;
struct PPP_VideoCapture_Dev;
struct PP_VideoCaptureDeviceInfo_Dev;
@@ -21,7 +22,7 @@ namespace proxy {
class PPB_VideoCapture_Proxy : public InterfaceProxy {
public:
- PPB_VideoCapture_Proxy(Dispatcher* dispatcher);
+ explicit PPB_VideoCapture_Proxy(Dispatcher* dispatcher);
virtual ~PPB_VideoCapture_Proxy();
static PP_Resource CreateProxyResource(PP_Instance instance);
@@ -46,7 +47,7 @@ class PPB_VideoCapture_Proxy : public InterfaceProxy {
class PPP_VideoCapture_Proxy : public InterfaceProxy {
public:
- PPP_VideoCapture_Proxy(Dispatcher* dispatcher);
+ explicit PPP_VideoCapture_Proxy(Dispatcher* dispatcher);
virtual ~PPP_VideoCapture_Proxy();
static const Info* GetInfo();
@@ -79,4 +80,4 @@ class PPP_VideoCapture_Proxy : public InterfaceProxy {
} // namespace proxy
} // namespace ppapi
-#endif // PPAPI_PPB_VIDEO_CAPTURE_PROXY_H_
+#endif // PPAPI_PROXY_PPB_VIDEO_CAPTURE_PROXY_H_
diff --git a/ppapi/proxy/ppp_class_proxy.h b/ppapi/proxy/ppp_class_proxy.h
index d38716d..9f41061 100644
--- a/ppapi/proxy/ppp_class_proxy.h
+++ b/ppapi/proxy/ppp_class_proxy.h
@@ -13,7 +13,6 @@
#include "ppapi/proxy/interface_proxy.h"
struct PPB_Var_Deprecated;
-struct PPP_Class_Deprecated;
namespace ppapi {
namespace proxy {
@@ -28,7 +27,7 @@ class PPP_Class_Proxy : public InterfaceProxy {
public:
// PPP_Class isn't a normal interface that you can query for, so this
// constructor doesn't take an interface pointer.
- PPP_Class_Proxy(Dispatcher* dispatcher);
+ explicit PPP_Class_Proxy(Dispatcher* dispatcher);
virtual ~PPP_Class_Proxy();
// Factory function used for registration (normal code can just use the
diff --git a/ppapi/proxy/ppp_instance_proxy.h b/ppapi/proxy/ppp_instance_proxy.h
index 4088855..2fce675 100644
--- a/ppapi/proxy/ppp_instance_proxy.h
+++ b/ppapi/proxy/ppp_instance_proxy.h
@@ -21,11 +21,9 @@ struct PP_Rect;
namespace ppapi {
namespace proxy {
-class SerializedVarReturnValue;
-
class PPP_Instance_Proxy : public InterfaceProxy {
public:
- PPP_Instance_Proxy(Dispatcher* dispatcher);
+ explicit PPP_Instance_Proxy(Dispatcher* dispatcher);
virtual ~PPP_Instance_Proxy();
// Return the info for the 1.0 (latest, canonical) version of the interface.
diff --git a/ppapi/proxy/proxy_channel.h b/ppapi/proxy/proxy_channel.h
index 75b9ad3..0a1fb03 100644
--- a/ppapi/proxy/proxy_channel.h
+++ b/ppapi/proxy/proxy_channel.h
@@ -24,8 +24,6 @@ class TestSink;
namespace ppapi {
namespace proxy {
-class VarSerializationRules;
-
class PPAPI_PROXY_EXPORT ProxyChannel
: public IPC::Channel::Listener,
public IPC::Message::Sender {
@@ -77,7 +75,7 @@ class PPAPI_PROXY_EXPORT ProxyChannel
#endif
protected:
- ProxyChannel(base::ProcessHandle remote_process_handle);
+ explicit ProxyChannel(base::ProcessHandle remote_process_handle);
// You must call this function before anything else. Returns true on success.
// The delegate pointer must outlive this class, ownership is not
diff --git a/ppapi/proxy/proxy_module.h b/ppapi/proxy/proxy_module.h
index 8bddffa..1ee0b75 100644
--- a/ppapi/proxy/proxy_module.h
+++ b/ppapi/proxy/proxy_module.h
@@ -15,8 +15,6 @@ template<typename T> struct DefaultSingletonTraits;
namespace ppapi {
namespace proxy {
-class PluginDispatcher;
-
class PPAPI_PROXY_EXPORT ProxyModule {
public:
// The global singleton getter.