summaryrefslogtreecommitdiffstats
path: root/chrome/common/child_process_logging_win.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 07:47:39 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 07:47:39 +0000
commitc8865964330959b40718c0e6148288da64f14fec (patch)
tree78a39905db0a850690c673a76ef59eadb28f54d6 /chrome/common/child_process_logging_win.cc
parent3ce10b7c419cc4522f885008cbb3c76b02256ba3 (diff)
downloadchromium_src-c8865964330959b40718c0e6148288da64f14fec.zip
chromium_src-c8865964330959b40718c0e6148288da64f14fec.tar.gz
chromium_src-c8865964330959b40718c0e6148288da64f14fec.tar.bz2
Fix regression where we stopped running content scripts in
extension processes. BUG=29621 Review URL: http://codereview.chromium.org/505012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/child_process_logging_win.cc')
-rw-r--r--chrome/common/child_process_logging_win.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/common/child_process_logging_win.cc b/chrome/common/child_process_logging_win.cc
index 9a11e8f..654b4fb 100644
--- a/chrome/common/child_process_logging_win.cc
+++ b/chrome/common/child_process_logging_win.cc
@@ -66,7 +66,7 @@ void SetClientId(const std::string& client_id) {
(set_client_id)(wstr.c_str());
}
-void SetActiveExtensions(const std::vector<std::string>& extension_ids) {
+void SetActiveExtensions(const std::set<std::string>& extension_ids) {
static MainSetExtensionID set_extension_id = NULL;
if (!set_extension_id) {
HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
@@ -78,11 +78,14 @@ void SetActiveExtensions(const std::vector<std::string>& extension_ids) {
return;
}
+ std::set<std::string>::const_iterator iter = extension_ids.begin();
for (size_t i = 0; i < kMaxReportedActiveExtensions; ++i) {
- if (i < extension_ids.size())
- (set_extension_id)(i, ASCIIToWide(extension_ids[i].c_str()).c_str());
- else
+ if (iter != extension_ids.end()) {
+ (set_extension_id)(i, ASCIIToWide(iter->c_str()).c_str());
+ ++iter;
+ } else {
(set_extension_id)(i, L"");
+ }
}
}