diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 03:12:01 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 03:12:01 +0000 |
| commit | 49220ebc9c99524a640625e21d83e0c04c392d54 (patch) | |
| tree | c89171751d868c362373ea873c33cba97950bd49 /chrome/browser/plugin_process_host.cc | |
| parent | 2bd06dc47154f3f37d7bf7622afbcad1a2536c46 (diff) | |
| download | chromium_src-49220ebc9c99524a640625e21d83e0c04c392d54.zip chromium_src-49220ebc9c99524a640625e21d83e0c04c392d54.tar.gz chromium_src-49220ebc9c99524a640625e21d83e0c04c392d54.tar.bz2 | |
Re-commit r22981 after backout at r22992. Contains fixes to relocate
plugin_carbon_interpose.dylib from the outer browser app bundle to the inner
helper app bundle.
Provide a separate app bundle for subprocesses like the renderer on the Mac.
Remove LSUIElement and related hacks from the browser's app bundle.
BUG=8044
TEST=Observe one Chromium and one or more Chromium Helper processes in
Activity Monitor
Review URL: http://codereview.chromium.org/164177
Review URL: http://codereview.chromium.org/164303
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_process_host.cc')
| -rw-r--r-- | chrome/browser/plugin_process_host.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 3c5f169..9a81b94 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -335,11 +335,10 @@ bool PluginProcessHost::Init(const WebPluginInfo& info, // build command line for plugin, we have to quote the plugin's path to deal // with spaces. - const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); - std::wstring exe_path = - browser_command_line.GetSwitchValue(switches::kBrowserSubprocessPath); - if (exe_path.empty() && !PathService::Get(base::FILE_EXE, &exe_path)) + std::wstring exe_path = GetChildPath(); + if (exe_path.empty()) { return false; + } CommandLine cmd_line(exe_path); if (logging::DialogsAreSuppressed()) @@ -368,6 +367,8 @@ bool PluginProcessHost::Init(const WebPluginInfo& info, switches::kEnableStatsTable, }; + const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); + for (size_t i = 0; i < arraysize(switch_names); ++i) { if (browser_command_line.HasSwitch(switch_names[i])) { cmd_line.AppendSwitchWithValue( |