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; |
} |