diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-21 08:05:28 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-21 08:05:28 +0000 |
| commit | 8930d471c128ed74b11beaa78ea1b171c1ac7157 (patch) | |
| tree | 5a20cb03c8e5019385709bc069e67f03488c41a1 /chrome/plugin/plugin_main.cc | |
| parent | a41fae8db8109bfeed047015b77b0d9227118540 (diff) | |
| download | chromium_src-8930d471c128ed74b11beaa78ea1b171c1ac7157.zip chromium_src-8930d471c128ed74b11beaa78ea1b171c1ac7157.tar.gz chromium_src-8930d471c128ed74b11beaa78ea1b171c1ac7157.tar.bz2 | |
Refactor code from RenderThread and PluginThread and move it to ChildThread. ChildProcess now owns the ChildThread, which removes duplicate code and simplifies things.
Clean up ChildProcess, there really was no need for all the templates and statics in it and its subclasses.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10080
Review URL: http://codereview.chromium.org/21502
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/plugin_main.cc')
| -rw-r--r-- | chrome/plugin/plugin_main.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index c7bb53d..bc40fb9 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -53,12 +53,8 @@ int PluginMain(const MainFunctionParams& parameters) { MB_OK | MB_SETFOREGROUND); } - std::wstring channel_name = - parsed_command_line.GetSwitchValue(switches::kProcessChannelID); - FilePath plugin_path = - FilePath::FromWStringHack( - parsed_command_line.GetSwitchValue(switches::kPluginPath)); - if (PluginProcess::GlobalInit(channel_name, plugin_path)) { + { + PluginProcess plugin_process; if (!no_sandbox && target_services) { target_services->LowerToken(); } @@ -83,7 +79,6 @@ int PluginMain(const MainFunctionParams& parameters) { // message loop to use it when translating messages. MessageLoop::current()->Run(); } - PluginProcess::GlobalCleanup(); CoUninitialize(); return 0; |