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

Unified Diff: chrome_frame/chrome_frame_activex_base.h

Issue 2895010: Handling case where automation server is NULL when creating the active doc wi... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 months 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 | « chrome_frame/chrome_active_document.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome_frame/chrome_active_document.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698