diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 19:13:43 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 19:13:43 +0000 |
commit | 747ab0d4b60d997bc6036c4ec7d70dae6bef6c85 (patch) | |
tree | 7d6de1a2eb3900444fda347a60bbb7b63da5a9e7 /content/ppapi_plugin | |
parent | a041229a7dfe1dc778a2c414b8d75351e517e172 (diff) | |
download | chromium_src-747ab0d4b60d997bc6036c4ec7d70dae6bef6c85.zip chromium_src-747ab0d4b60d997bc6036c4ec7d70dae6bef6c85.tar.gz chromium_src-747ab0d4b60d997bc6036c4ec7d70dae6bef6c85.tar.bz2 |
Add a way to pass information to Pepper Flash from the command-line (e.g., for debugging).
This also adds a |ProxyModule| singleton object to the Pepper proxy, which we
may eventually use for communicating directly with the browser.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6910007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
-rw-r--r-- | content/ppapi_plugin/ppapi_plugin_main.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc index bca4073..92cb004 100644 --- a/content/ppapi_plugin/ppapi_plugin_main.cc +++ b/content/ppapi_plugin/ppapi_plugin_main.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/command_line.h" #include "base/message_loop.h" #include "base/threading/platform_thread.h" #include "build/build_config.h" @@ -9,6 +10,7 @@ #include "content/common/content_switches.h" #include "content/common/main_function_params.h" #include "content/ppapi_plugin/ppapi_thread.h" +#include "ppapi/proxy/proxy_module.h" // Main function for starting the PPAPI plugin process. int PpapiPluginMain(const MainFunctionParams& parameters) { @@ -23,6 +25,9 @@ int PpapiPluginMain(const MainFunctionParams& parameters) { ChildProcess ppapi_process; ppapi_process.set_main_thread(new PpapiThread(false)); // Not a broker. + pp::proxy::ProxyModule::GetInstance()->SetFlashCommandLineArgs( + command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs)); + main_message_loop.Run(); return 0; } |