diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 22:28:16 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 22:28:16 +0000 |
| commit | 9a3a293b332de07fe81522061fadd8883789ec4a (patch) | |
| tree | 39e2c276c3a7ef8668884bd02c590c8eccb51aa9 /chrome/browser/plugin_process_host.cc | |
| parent | bb050c16657599d3cdee43c8d377ebcca0da64eb (diff) | |
| download | chromium_src-9a3a293b332de07fe81522061fadd8883789ec4a.zip chromium_src-9a3a293b332de07fe81522061fadd8883789ec4a.tar.gz chromium_src-9a3a293b332de07fe81522061fadd8883789ec4a.tar.bz2 | |
ipc: use strings, not wstrings for channel ids.
They're ASCII anyway.
TEST=covered by existing tests
Review URL: http://codereview.chromium.org/119131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_process_host.cc')
| -rw-r--r-- | chrome/browser/plugin_process_host.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 53dfe47..39ec81d 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -380,7 +380,8 @@ bool PluginProcessHost::Init(const WebPluginInfo& info, cmd_line.AppendSwitchWithValue(switches::kProcessType, switches::kPluginProcess); - cmd_line.AppendSwitchWithValue(switches::kProcessChannelID, channel_id()); + cmd_line.AppendSwitchWithValue(switches::kProcessChannelID, + ASCIIToWide(channel_id())); cmd_line.AppendSwitchWithValue(switches::kPluginPath, info.path.ToWStringHack()); @@ -449,7 +450,7 @@ void PluginProcessHost::OnChannelConnected(int32 peer_pid) { void PluginProcessHost::OnChannelError() { for (size_t i = 0; i < pending_requests_.size(); ++i) { ReplyToRenderer(pending_requests_[i].renderer_message_filter_.get(), - std::wstring(), + std::string(), FilePath(), pending_requests_[i].reply_msg); } @@ -501,7 +502,7 @@ void PluginProcessHost::OnResolveProxyCompleted(IPC::Message* reply_msg, void PluginProcessHost::ReplyToRenderer( ResourceMessageFilter* renderer_message_filter, - const std::wstring& channel, const FilePath& plugin_path, + const std::string& channel, const FilePath& plugin_path, IPC::Message* reply_msg) { ViewHostMsg_OpenChannelToPlugin::WriteReplyParams(reply_msg, channel, plugin_path); @@ -529,12 +530,12 @@ void PluginProcessHost::RequestPluginChannel( sent_requests_.push(ChannelRequest( renderer_message_filter, mime_type, reply_msg)); } else { - ReplyToRenderer(renderer_message_filter, std::wstring(), FilePath(), + ReplyToRenderer(renderer_message_filter, std::string(), FilePath(), reply_msg); } } -void PluginProcessHost::OnChannelCreated(const std::wstring& channel_name) { +void PluginProcessHost::OnChannelCreated(const std::string& channel_name) { ReplyToRenderer(sent_requests_.front().renderer_message_filter_.get(), channel_name, info_.path, |