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

Unified Diff: chrome/browser/ui/views/external_tab_container_win.cc

Issue 11746029: Cause Chrome Frame to follow the fast shutdown path, which cleans up infobars and avoids a crash on… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 12 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/browser/chrome_content_browser_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/external_tab_container_win.cc
diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc
index 42e67b25860289a9af5faff8b2cdc90f6574fc89..070725cd576f4557d9c5f47b2947f284d95d9b29 100644
--- a/chrome/browser/ui/views/external_tab_container_win.cc
+++ b/chrome/browser/ui/views/external_tab_container_win.cc
@@ -266,6 +266,10 @@ void ExternalTabContainerWin::Uninitialize() {
if (web_contents_.get()) {
UnregisterRenderViewHost(web_contents_->GetRenderViewHost());
+ // Explicitly tell the RPH to shutdown, as doing so is the only thing that
+ // cleans up certain resources like infobars (crbug.com/148398).
+ web_contents_->GetRenderProcessHost()->FastShutdownIfPossible();
+
if (GetWidget()->GetRootView())
GetWidget()->GetRootView()->RemoveAllChildViews(true);
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698