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

Unified Diff: extensions/shell/browser/shell_browser_main_parts.cc

Issue 693603003: [DevTools] Split DevToolsHttpHandler into two classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell
Patch Set: Created 6 years, 1 month 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 | « content/content_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_browser_main_parts.cc
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index 7681b660408ce53a1f0c3ec5c516f40a4355d1b8..0e22cbcc8436b1da42849e74028f8a173041579d 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -71,10 +71,7 @@ ShellBrowserMainParts::ShellBrowserMainParts(
}
ShellBrowserMainParts::~ShellBrowserMainParts() {
- if (devtools_http_handler_) {
- // Note that Stop destroys devtools_http_handler_.
- devtools_http_handler_->Stop();
- }
+ DCHECK(!devtools_http_handler_);
}
void ShellBrowserMainParts::PreMainMessageLoopStart() {
@@ -214,6 +211,11 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
extension_system_ = NULL;
ExtensionsBrowserClient::Set(NULL);
extensions_browser_client_.reset();
+ if (devtools_http_handler_) {
James Cook 2014/11/11 18:32:31 If possible please move this to immediately after
vkuzkokov 2014/11/12 09:41:20 Moved.
+ // Note that Stop destroys devtools_http_handler_.
+ devtools_http_handler_->Stop();
+ devtools_http_handler_ = nullptr;
+ }
browser_context_.reset();
desktop_controller_.reset();
« no previous file with comments | « content/content_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698