summaryrefslogtreecommitdiffstats
path: root/content/plugin/plugin_main.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-21 19:52:47 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-21 19:52:47 +0000
commit91355a856f83888eab29f6a3299aa7c0fe69c3e3 (patch)
tree99ecc647ffb3988279cc768a5a00b7d5a32125ce /content/plugin/plugin_main.cc
parent8463d75aed2831944bfc7471ef239b0c6e31a6ca (diff)
downloadchromium_src-91355a856f83888eab29f6a3299aa7c0fe69c3e3.zip
chromium_src-91355a856f83888eab29f6a3299aa7c0fe69c3e3.tar.gz
chromium_src-91355a856f83888eab29f6a3299aa7c0fe69c3e3.tar.bz2
Move content's a plugin, ppapi_plugin, utility, and worker subdirectories to the content namespace.
Review URL: https://codereview.chromium.org/11231016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin/plugin_main.cc')
-rw-r--r--content/plugin/plugin_main.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 7bef97c..a3b5b13 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -29,6 +29,8 @@
#include "ipc/ipc_descriptors.h"
#endif
+namespace content {
+
#if defined(OS_MACOSX)
// Removes our Carbon library interposing from the environment so that it
// doesn't carry into any processes that plugins might start.
@@ -42,7 +44,7 @@ void WorkaroundFlashLAHF();
#endif
// main() routine for running as the plugin process.
-int PluginMain(const content::MainFunctionParams& parameters) {
+int PluginMain(const MainFunctionParams& parameters) {
// The main thread of the plugin services UI.
#if defined(OS_MACOSX)
#if !defined(__LP64__)
@@ -80,3 +82,5 @@ int PluginMain(const content::MainFunctionParams& parameters) {
return 0;
}
+
+} // namespace content