diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 20:25:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 20:25:18 +0000 |
| commit | 4573fbd30d7ed70f959efb69b32ad9547465f0ce (patch) | |
| tree | 958d424cf2dfa7b22aba942c8ebc383a5ba22517 /content/ppapi_plugin | |
| parent | 5262dc192af688c4f9301753fa7890975303b909 (diff) | |
| download | chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.zip chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.tar.gz chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.tar.bz2 | |
Move content_restriction.h and main_function_params.h to content/public/common, and put them in the content namespace.
BUG=98716
Review URL: http://codereview.chromium.org/8387039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_broker_main.cc | 4 | ||||
| -rw-r--r-- | content/ppapi_plugin/ppapi_plugin_main.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/content/ppapi_plugin/ppapi_broker_main.cc b/content/ppapi_plugin/ppapi_broker_main.cc index f2a546e..7963e29 100644 --- a/content/ppapi_plugin/ppapi_broker_main.cc +++ b/content/ppapi_plugin/ppapi_broker_main.cc @@ -6,12 +6,12 @@ #include "base/threading/platform_thread.h" #include "build/build_config.h" #include "content/common/child_process.h" -#include "content/common/main_function_params.h" #include "content/ppapi_plugin/ppapi_thread.h" #include "content/public/common/content_switches.h" +#include "content/public/common/main_function_params.h" // Main function for starting the PPAPI broker process. -int PpapiBrokerMain(const MainFunctionParams& parameters) { +int PpapiBrokerMain(const content::MainFunctionParams& parameters) { const CommandLine& command_line = parameters.command_line; if (command_line.HasSwitch(switches::kPpapiStartupDialog)) { ChildProcess::WaitForDebugger("PpapiBroker"); diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc index 11d771d..1b0d2ee 100644 --- a/content/ppapi_plugin/ppapi_plugin_main.cc +++ b/content/ppapi_plugin/ppapi_plugin_main.cc @@ -8,9 +8,9 @@ #include "base/threading/platform_thread.h" #include "build/build_config.h" #include "content/common/child_process.h" -#include "content/common/main_function_params.h" #include "content/ppapi_plugin/ppapi_thread.h" #include "content/public/common/content_switches.h" +#include "content/public/common/main_function_params.h" #include "ppapi/proxy/proxy_module.h" #if defined(OS_WIN) @@ -28,7 +28,7 @@ void* g_target_services = 0; #endif // Main function for starting the PPAPI plugin process. -int PpapiPluginMain(const MainFunctionParams& parameters) { +int PpapiPluginMain(const content::MainFunctionParams& parameters) { const CommandLine& command_line = parameters.command_line; #if defined(OS_WIN) |