bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash loading chrome://net-internals

This commit is contained in:
Marshall Greenblatt 2017-08-10 16:55:48 -04:00
parent b153ba46db
commit 76eb49196e
1 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
patch/patches/webui_2037.patch
View File

@ -1,18 +1,55 @@
diff --git chrome/browser/ui/webui/net_internals/net_internals_ui.cc chrome/browser/ui/webui/net_internals/net_internals_ui.cc diff --git chrome/browser/ui/webui/net_internals/net_internals_ui.cc chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 028eff9..b8390d2 100644 index 028eff9..2495103d 100644
--- chrome/browser/ui/webui/net_internals/net_internals_ui.cc --- chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -525,8 +525,7 @@ void NetInternalsMessageHandler::OnGetSessionNetworkStats( @@ -508,41 +508,31 @@ void NetInternalsMessageHandler::OnClearBrowserCache(
void NetInternalsMessageHandler::OnGetPrerenderInfo(
const base::ListValue* list) { const base::ListValue* list) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
SendJavascriptCommand( - SendJavascriptCommand(
- "receivedPrerenderInfo",
- chrome_browser_net::GetPrerenderInfo(Profile::FromWebUI(web_ui())));
+ SendJavascriptCommand("receivedPrerenderInfo", nullptr);
}
void NetInternalsMessageHandler::OnGetHistoricNetworkStats(
const base::ListValue* list) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- SendJavascriptCommand("receivedHistoricNetworkStats",
- chrome_browser_net::GetHistoricNetworkStats(
- Profile::FromWebUI(web_ui())));
+ SendJavascriptCommand("receivedHistoricNetworkStats", nullptr);
}
void NetInternalsMessageHandler::OnGetSessionNetworkStats(
const base::ListValue* list) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- SendJavascriptCommand(
- "receivedSessionNetworkStats", - "receivedSessionNetworkStats",
- chrome_browser_net::GetSessionNetworkStats(Profile::FromWebUI(web_ui()))); - chrome_browser_net::GetSessionNetworkStats(Profile::FromWebUI(web_ui())));
+ "receivedSessionNetworkStats", nullptr); + SendJavascriptCommand("receivedSessionNetworkStats", nullptr);
} }
void NetInternalsMessageHandler::OnGetExtensionInfo( void NetInternalsMessageHandler::OnGetExtensionInfo(
@@ -622,9 +621,17 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady( const base::ListValue* list) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- SendJavascriptCommand(
- "receivedExtensionInfo",
- chrome_browser_net::GetExtensionInfo(Profile::FromWebUI(web_ui())));
+ SendJavascriptCommand("receivedExtensionInfo", nullptr);
}
void NetInternalsMessageHandler::OnGetDataReductionProxyInfo(
const base::ListValue* list) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- SendJavascriptCommand("receivedDataReductionProxyInfo",
- chrome_browser_net::GetDataReductionProxyInfo(
- Profile::FromWebUI(web_ui())));
+ SendJavascriptCommand("receivedDataReductionProxyInfo", nullptr);
}
////////////////////////////////////////////////////////////////////////////////
@@ -622,9 +612,17 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
PrePopulateEventList(); PrePopulateEventList();
@ -33,7 +70,7 @@ index 028eff9..b8390d2 100644
} }
void NetInternalsMessageHandler::IOThreadImpl::OnGetNetInfo( void NetInternalsMessageHandler::IOThreadImpl::OnGetNetInfo(
@@ -1026,7 +1033,8 @@ void NetInternalsMessageHandler::IOThreadImpl::PrePopulateEventList() { @@ -1026,7 +1024,8 @@ void NetInternalsMessageHandler::IOThreadImpl::PrePopulateEventList() {
std::set<net::URLRequestContext*> contexts; std::set<net::URLRequestContext*> contexts;
for (const auto& getter : context_getters_) for (const auto& getter : context_getters_)
contexts.insert(getter->GetURLRequestContext()); contexts.insert(getter->GetURLRequestContext());