summaryrefslogtreecommitdiffstats
path: root/content/common/pepper_plugin_registry.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-23 06:19:28 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-23 06:19:28 +0000
commit3827e970d979f0775cdbce3e2f18aeeedff0753d (patch)
tree25a6767250ae3de1a04202ae5fcefa596662bc03 /content/common/pepper_plugin_registry.h
parentae3076559d7c5e4dfe940cfd27fc2f41cb161428 (diff)
downloadchromium_src-3827e970d979f0775cdbce3e2f18aeeedff0753d.zip
chromium_src-3827e970d979f0775cdbce3e2f18aeeedff0753d.tar.gz
chromium_src-3827e970d979f0775cdbce3e2f18aeeedff0753d.tar.bz2
Move a bunch of content\common code into the content namespace.
Review URL: https://codereview.chromium.org/11225045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/pepper_plugin_registry.h')
-rw-r--r--content/common/pepper_plugin_registry.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/content/common/pepper_plugin_registry.h b/content/common/pepper_plugin_registry.h
index 6a457694..f0a5ebf 100644
--- a/content/common/pepper_plugin_registry.h
+++ b/content/common/pepper_plugin_registry.h
@@ -11,11 +11,13 @@
#include "content/public/common/pepper_plugin_info.h"
#include "webkit/plugins/ppapi/plugin_delegate.h"
+namespace content {
+
// Constructs a PepperPluginInfo from a WebPluginInfo. Returns false if
// the operation is not possible, in particular the WebPluginInfo::type
// must be one of the pepper types.
bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info,
- content::PepperPluginInfo* pepper_info);
+ PepperPluginInfo* pepper_info);
// This class holds references to all of the known pepper plugin modules.
//
@@ -36,7 +38,7 @@ class PepperPluginRegistry
// plugin list every time it is called. Generally, code in the registry should
// be using the cached plugin_list_ instead.
CONTENT_EXPORT static void ComputeList(
- std::vector<content::PepperPluginInfo>* plugins);
+ std::vector<PepperPluginInfo>* plugins);
// Loads the (native) libraries but does not initialize them (i.e., does not
// call PPP_InitializeModule). This is needed by the zygote on Linux to get
@@ -47,8 +49,7 @@ class PepperPluginRegistry
// return value will be NULL if there is no such plugin.
//
// The returned pointer is owned by the PluginRegistry.
- const content::PepperPluginInfo* GetInfoForPlugin(
- const webkit::WebPluginInfo& info);
+ const PepperPluginInfo* GetInfoForPlugin(const webkit::WebPluginInfo& info);
// Returns an existing loaded module for the given path. It will search for
// both preloaded in-process or currently active (non crashed) out-of-process
@@ -70,7 +71,7 @@ class PepperPluginRegistry
PepperPluginRegistry();
// All known pepper plugins.
- std::vector<content::PepperPluginInfo> plugin_list_;
+ std::vector<PepperPluginInfo> plugin_list_;
// Plugins that have been preloaded so they can be executed in-process in
// the renderer (the sandbox prevents on-demand loading).
@@ -90,4 +91,6 @@ class PepperPluginRegistry
DISALLOW_COPY_AND_ASSIGN(PepperPluginRegistry);
};
+} // namespace content
+
#endif // CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_