OLD | NEW |
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 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
832 } | 832 } |
833 | 833 |
834 void NetInternalsMessageHandler::IOThreadImpl::OnWebUIDeleted() { | 834 void NetInternalsMessageHandler::IOThreadImpl::OnWebUIDeleted() { |
835 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 835 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
836 was_webui_deleted_ = true; | 836 was_webui_deleted_ = true; |
837 } | 837 } |
838 | 838 |
839 void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady( | 839 void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady( |
840 const ListValue* list) { | 840 const ListValue* list) { |
841 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 841 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
842 DCHECK(!net_log()) << "notifyReady called twice"; | |
843 | 842 |
844 SendJavascriptCommand("receivedConstants", | 843 SendJavascriptCommand("receivedConstants", |
845 NetInternalsUI::GetConstants()); | 844 NetInternalsUI::GetConstants()); |
846 | 845 |
847 // Register with network stack to observe events. | 846 if (!net_log()) { |
848 io_thread_->net_log()->AddThreadSafeObserver(this, | 847 // Register with network stack to observe events. |
849 net::NetLog::LOG_ALL_BUT_BYTES); | 848 io_thread_->net_log()->AddThreadSafeObserver(this, |
| 849 net::NetLog::LOG_ALL_BUT_BYTES); |
| 850 } |
850 } | 851 } |
851 | 852 |
852 void NetInternalsMessageHandler::IOThreadImpl::OnGetProxySettings( | 853 void NetInternalsMessageHandler::IOThreadImpl::OnGetProxySettings( |
853 const ListValue* list) { | 854 const ListValue* list) { |
854 net::URLRequestContext* context = context_getter_->GetURLRequestContext(); | 855 net::URLRequestContext* context = context_getter_->GetURLRequestContext(); |
855 net::ProxyService* proxy_service = context->proxy_service(); | 856 net::ProxyService* proxy_service = context->proxy_service(); |
856 | 857 |
857 DictionaryValue* dict = new DictionaryValue(); | 858 DictionaryValue* dict = new DictionaryValue(); |
858 if (proxy_service->fetched_config().is_valid()) | 859 if (proxy_service->fetched_config().is_valid()) |
859 dict->Set("original", proxy_service->fetched_config().ToValue()); | 860 dict->Set("original", proxy_service->fetched_config().ToValue()); |
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1673 } | 1674 } |
1674 | 1675 |
1675 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) | 1676 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) |
1676 : WebUIController(web_ui) { | 1677 : WebUIController(web_ui) { |
1677 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); | 1678 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); |
1678 | 1679 |
1679 // Set up the chrome://net-internals/ source. | 1680 // Set up the chrome://net-internals/ source. |
1680 Profile* profile = Profile::FromWebUI(web_ui); | 1681 Profile* profile = Profile::FromWebUI(web_ui); |
1681 ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource()); | 1682 ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource()); |
1682 } | 1683 } |
OLD | NEW |