| Index: chrome_frame/chrome_frame_activex_base.h
|
| ===================================================================
|
| --- chrome_frame/chrome_frame_activex_base.h (revision 51968)
|
| +++ chrome_frame/chrome_frame_activex_base.h (working copy)
|
| @@ -467,7 +467,12 @@
|
| BOOL& handled) { // NO_LINT
|
| ModifyStyle(0, WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0);
|
| url_fetcher_.put_notification_window(m_hWnd);
|
| - automation_client_->SetParentWindow(m_hWnd);
|
| + if (automation_client_.get()) {
|
| + automation_client_->SetParentWindow(m_hWnd);
|
| + } else {
|
| + NOTREACHED() << "No automation server";
|
| + return -1;
|
| + }
|
| // Only fire the 'interactive' ready state if we aren't there already.
|
| if (ready_state_ < READYSTATE_INTERACTIVE) {
|
| ready_state_ = READYSTATE_INTERACTIVE;
|
|
|