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

Unified Diff: ceee/ie/broker/chrome_postman.cc

Issue 5537004: Merge 68042 - We need to pin Chrome Frame so that it doesn't get stuck on rel... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/597/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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ceee/ie/broker/chrome_postman.cc
===================================================================
--- ceee/ie/broker/chrome_postman.cc (revision 68134)
+++ ceee/ie/broker/chrome_postman.cc (working copy)
@@ -244,6 +244,19 @@
LOG(ERROR) << "Failed to start chrome frame " << com::LogHr(hr);
return hr;
}
+ // We need to pin the Chrome Frame DLL so that it doesn't get unloaded
+ // while we call CoUninitialize in our thread cleanup, otherwise we would
+ // get stuck on breakpad termination as filed in http://crbug.com/64388.
+ static bool s_pinned = false;
+ if (!s_pinned) {
+ HMODULE unused;
+ if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_PIN, L"npchrome_frame.dll",
+ &unused)) {
+ NOTREACHED() << "Failed to pin Chrome Frame. " << com::LogWe();
+ } else {
+ s_pinned = true;
+ }
+ }
return hr;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698