diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-20 07:15:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-20 07:15:17 +0000 |
| commit | ea51de3307a6a5947ca047fa9d0e20359fdcf658 (patch) | |
| tree | c1a49c1d41c4bfbf74ddbc28c371f840dd2848fa /chrome/plugin/plugin_main.cc | |
| parent | b6aedfff89cd93f07c1c38a13062801e81bf26e4 (diff) | |
| download | chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.zip chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.tar.gz chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.tar.bz2 | |
Reverting 10080.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10082 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, 7 insertions, 2 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index bc40fb9..c7bb53d 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -53,8 +53,12 @@ int PluginMain(const MainFunctionParams& parameters) { MB_OK | MB_SETFOREGROUND); } - { - PluginProcess plugin_process; + 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)) { if (!no_sandbox && target_services) { target_services->LowerToken(); } @@ -79,6 +83,7 @@ int PluginMain(const MainFunctionParams& parameters) { // message loop to use it when translating messages. MessageLoop::current()->Run(); } + PluginProcess::GlobalCleanup(); CoUninitialize(); return 0; |