summaryrefslogtreecommitdiffstats
path: root/ceee
diff options
context:
space:
mode:
authormad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-29 21:57:10 +0000
committermad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-29 21:57:10 +0000
commit3f05b8d80f961a408a50a0ded198fc83c07125f3 (patch)
treeaaf996b73fe795b98e1c45646a4a313c5b02cd61 /ceee
parent65f86878792c6e8bb5b78e98ed96dd99ce2c30bb (diff)
downloadchromium_src-3f05b8d80f961a408a50a0ded198fc83c07125f3.zip
chromium_src-3f05b8d80f961a408a50a0ded198fc83c07125f3.tar.gz
chromium_src-3f05b8d80f961a408a50a0ded198fc83c07125f3.tar.bz2
Small fix to make sure we always start connection ID sequences to the same value.
BUG=None TEST=None Review URL: http://codereview.chromium.org/5372005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
-rw-r--r--ceee/ie/plugin/bho/extension_port_manager.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/ceee/ie/plugin/bho/extension_port_manager.cc b/ceee/ie/plugin/bho/extension_port_manager.cc
index aea358e..6941833 100644
--- a/ceee/ie/plugin/bho/extension_port_manager.cc
+++ b/ceee/ie/plugin/bho/extension_port_manager.cc
@@ -7,16 +7,18 @@
#include "ceee/ie/plugin/bho/extension_port_manager.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
+#include "base/win/scoped_bstr.h"
#include "ceee/ie/common/chrome_frame_host.h"
#include "ceee/ie/plugin/scripting/content_script_native_api.h"
#include "chrome/browser/automation/extension_automation_constants.h"
namespace ext = extension_automation_constants;
-ExtensionPortManager::ExtensionPortManager() {
+ExtensionPortManager::ExtensionPortManager() : next_connection_id_(0) {
}
ExtensionPortManager::~ExtensionPortManager() {
@@ -186,6 +188,7 @@ HRESULT ExtensionPortManager::PostMessageToHost(const std::string& message,
const std::string& target) {
// Post our message through the ChromeFrameHost. We allow queueing,
// because we don't synchronize to the destination extension loading.
- return chrome_frame_host_->PostMessage(CComBSTR(message.c_str()),
- CComBSTR(target.c_str()));
+ return chrome_frame_host_->PostMessage(
+ base::win::ScopedBstr(ASCIIToWide(message).c_str()),
+ base::win::ScopedBstr(ASCIIToWide(target).c_str()));
}