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

Unified Diff: chrome/browser/devtools/devtools_window.cc

Issue 286843002: DevTools: Fixed handling of unexpected renderer termination (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved ClientHostClosing to CloseContents Created 6 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index da8615c14703f1527e6d3b42a82c26128f7d110c..34739f1c37cc7cc3d835eec5bdd0d660d05ef2de 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -752,6 +752,11 @@ void DevToolsWindow::AddNewContents(WebContents* source,
void DevToolsWindow::CloseContents(WebContents* source) {
CHECK(is_docked_);
+ // Do this first so that when GetDockedInstanceForInspectedTab is called
+ // from UpdateDevTools it won't return this instance
+ // see crbug.com/372504
+ content::DevToolsManager::GetInstance()->ClientHostClosing(
+ bindings_->frontend_host());
// This will prevent any activity after frontend is loaded.
action_on_load_ = DevToolsToggleAction::NoOp();
ignore_set_is_docked_ = true;
@@ -1022,6 +1027,7 @@ InfoBarService* DevToolsWindow::GetInfoBarService() {
void DevToolsWindow::RenderProcessGone() {
// Docked DevToolsWindow owns its web_contents_ and must delete it.
// Undocked web_contents_ are owned and handled by browser.
+ // see crbug.com/369932
if (is_docked_)
CloseContents(web_contents_);
}
« 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