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

Side by Side 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: fix reload DCHECKs 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" 5 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 } 881 }
882 882
883 void NetInternalsMessageHandler::IOThreadImpl::OnWebUIDeleted() { 883 void NetInternalsMessageHandler::IOThreadImpl::OnWebUIDeleted() {
884 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 884 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
885 was_webui_deleted_ = true; 885 was_webui_deleted_ = true;
886 } 886 }
887 887
888 void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady( 888 void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
889 const ListValue* list) { 889 const ListValue* list) {
890 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 890 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
891 DCHECK(!net_log()) << "notifyReady called twice";
892 891
893 SendJavascriptCommand("receivedConstants", 892 SendJavascriptCommand("receivedConstants",
894 NetInternalsUI::GetConstants()); 893 NetInternalsUI::GetConstants());
895 894
896 // Register with network stack to observe events. 895 if (!net_log()) {
897 io_thread_->net_log()->AddThreadSafeObserver(this, 896 // Register with network stack to observe events.
898 net::NetLog::LOG_ALL_BUT_BYTES); 897 io_thread_->net_log()->AddThreadSafeObserver(this,
898 net::NetLog::LOG_ALL_BUT_BYTES);
899 }
899 } 900 }
900 901
901 void NetInternalsMessageHandler::IOThreadImpl::OnGetProxySettings( 902 void NetInternalsMessageHandler::IOThreadImpl::OnGetProxySettings(
902 const ListValue* list) { 903 const ListValue* list) {
903 net::URLRequestContext* context = context_getter_->GetURLRequestContext(); 904 net::URLRequestContext* context = context_getter_->GetURLRequestContext();
904 net::ProxyService* proxy_service = context->proxy_service(); 905 net::ProxyService* proxy_service = context->proxy_service();
905 906
906 DictionaryValue* dict = new DictionaryValue(); 907 DictionaryValue* dict = new DictionaryValue();
907 if (proxy_service->fetched_config().is_valid()) 908 if (proxy_service->fetched_config().is_valid())
908 dict->Set("original", proxy_service->fetched_config().ToValue()); 909 dict->Set("original", proxy_service->fetched_config().ToValue());
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
1723 1724
1724 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1725 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1725 : WebUIController(web_ui) { 1726 : WebUIController(web_ui) {
1726 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 1727 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
1727 1728
1728 // Set up the chrome://net-internals/ source. 1729 // Set up the chrome://net-internals/ source.
1729 Profile* profile = Profile::FromWebUI(web_ui); 1730 Profile* profile = Profile::FromWebUI(web_ui);
1730 profile->GetChromeURLDataManager()->AddDataSource( 1731 profile->GetChromeURLDataManager()->AddDataSource(
1731 CreateNetInternalsHTMLSource()); 1732 CreateNetInternalsHTMLSource());
1732 } 1733 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698