Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(929)

Unified Diff: ceee/ie/plugin/bho/executor.cc

Issue 5544010: Revert 68293 - Revert 68290 - Restored missing BrokerRpcClient::Connect.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ceee/ie/plugin/bho/executor.h ('k') | ceee/ie/plugin/bho/webrequest_notifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ceee/ie/plugin/bho/executor.cc
===================================================================
--- ceee/ie/plugin/bho/executor.cc (revision 68295)
+++ ceee/ie/plugin/bho/executor.cc (working copy)
@@ -370,7 +370,11 @@
return hr;
}
-CeeeExecutor::CeeeExecutor() : hwnd_(NULL) {
+CeeeExecutor::CeeeExecutor()
+ : hwnd_(NULL),
+ // Don't restart on broker crash. It won't work because executor was
+ // already registered in dead broker.
+ broker_rpc_client_(false) {
}
CeeeExecutor::~CeeeExecutor() {
@@ -426,9 +430,13 @@
// Infobar. In any case, the construction below should have a reference to
// a BHO and its EventSender so we don't create Infobars before the tab_id
// is ready.
- if (window_utils::GetTopLevelParent(hwnd_) != hwnd_)
+ if (window_utils::GetTopLevelParent(hwnd_) != hwnd_) {
+ hr = broker_rpc_client_.Connect(true);
+ if (FAILED(hr))
+ return hr;
infobar_manager_.reset(
- new infobar_api::InfobarManager(hwnd_, new BrokerRpcClient(false)));
+ new infobar_api::InfobarManager(hwnd_, &broker_rpc_client_));
+ }
return S_OK;
}
« no previous file with comments | « ceee/ie/plugin/bho/executor.h ('k') | ceee/ie/plugin/bho/webrequest_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698