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

Unified Diff: chrome_frame/chrome_frame_automation.cc

Issue 3241008: Silencing a couple of dchecks that occur when running the debug version of th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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_automation.cc
===================================================================
--- chrome_frame/chrome_frame_automation.cc (revision 57992)
+++ chrome_frame/chrome_frame_automation.cc (working copy)
@@ -613,7 +613,12 @@
// InitializeComplete is called successfully.
init_state_ = INITIALIZING;
- HRESULT hr = security_manager_.CreateInstance(CLSID_InternetSecurityManager);
+ HRESULT hr = S_OK;
+ // If chrome crashed and is being restarted, the security_manager_ object
+ // might already be valid.
+ if (security_manager_.get() == NULL)
+ hr = security_manager_.CreateInstance(CLSID_InternetSecurityManager);
+
if (FAILED(hr)) {
NOTREACHED() << __FUNCTION__
<< " Failed to create InternetSecurityManager. Error: 0x%x"
« 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