summaryrefslogtreecommitdiffstats
path: root/ceee/ie/broker/broker_module.cc
diff options
context:
space:
mode:
authorsiggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 16:48:19 +0000
committersiggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 16:48:19 +0000
commit054f941471fb9a62e585f91d04bcba73c8d03b9f (patch)
treeabc12b2695a1b2e83291b23159df451acc0e34f6 /ceee/ie/broker/broker_module.cc
parentdb300df5f6b747e9575e3740083f2ec328b09a2e (diff)
downloadchromium_src-054f941471fb9a62e585f91d04bcba73c8d03b9f.zip
chromium_src-054f941471fb9a62e585f91d04bcba73c8d03b9f.tar.gz
chromium_src-054f941471fb9a62e585f91d04bcba73c8d03b9f.tar.bz2
Revert 67102 - Use async COM to service tab executor requests.
Change to proxy/stub marshaling from typelib marshaling, with manual registration of proxy/stubs. Moving away from registered proxy/stubs is desireable in the context of upcoming GCF autoupdate changes, and this is an opportune moment. Implement an async ICeeeTabExecutor that defers execution until a posted message is processed. This avoids (I hope) processing reentrantly on out-of-apartment invocations in IE, which has a tendency to lead to deadlocks and general nastyness. BUG=none TEST=unittests in change Review URL: http://codereview.chromium.org/4845001 TBR=siggi@chromium.org Review URL: http://codereview.chromium.org/5343001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee/ie/broker/broker_module.cc')
-rw-r--r--ceee/ie/broker/broker_module.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/ceee/ie/broker/broker_module.cc b/ceee/ie/broker/broker_module.cc
index 252e6a4..0d7a0eb 100644
--- a/ceee/ie/broker/broker_module.cc
+++ b/ceee/ie/broker/broker_module.cc
@@ -18,7 +18,6 @@
#include "ceee/ie/broker/executors_manager.h"
#include "ceee/ie/broker/resource.h"
#include "ceee/ie/broker/window_events_funnel.h"
-#include "ceee/ie/plugin/toolband/toolband_proxy.h"
#include "ceee/ie/common/crash_reporter.h"
#include "ceee/common/com_utils.h"
#include "chrome/common/url_constants.h"
@@ -154,14 +153,6 @@ HRESULT CeeeBrokerModule::InitializeCom() {
DLOG_IF(WARNING, FAILED(hr)) << "IGlobalOptions::Set failed "
<< com::LogHr(hr);
- // Register the executor proxy/stubs.
- // Note that this registers the proxy/stub class objects for all threads
- // in the multithreaded apartment.
- if (!RegisterProxyStubs(NULL)) {
- LOG(ERROR) << "Failed to register executor proxy/stubs";
- return E_UNEXPECTED;
- }
-
// The above is best-effort, don't bail on error.
return S_OK;
}