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

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 10154004: re-use WebUIs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: WeakPtr solution Created 8 years, 8 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/ui/webui/help/help_handler.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index f3092971c5afa76127d36e249ac9eb8889963bd3..324bf0707b0a67e23775ea23ca3d8ccd0523770f 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -839,14 +839,15 @@ void NetInternalsMessageHandler::IOThreadImpl::OnWebUIDeleted() {
void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
const ListValue* list) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- DCHECK(!net_log()) << "notifyReady called twice";
SendJavascriptCommand("receivedConstants",
NetInternalsUI::GetConstants());
- // Register with network stack to observe events.
- io_thread_->net_log()->AddThreadSafeObserver(this,
- net::NetLog::LOG_ALL_BUT_BYTES);
+ if (!net_log()) {
+ // Register with network stack to observe events.
+ io_thread_->net_log()->AddThreadSafeObserver(this,
+ net::NetLog::LOG_ALL_BUT_BYTES);
+ }
}
void NetInternalsMessageHandler::IOThreadImpl::OnGetProxySettings(
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698