| 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 1f55dd854a0a0b85df580d0ea194d66baaeaf261..2c2fb2d8c2ab8a10805ca8c6676a9284bfdba526 100644
|
| --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
|
| +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
|
| @@ -37,6 +37,8 @@
|
| #include "chrome/browser/net/chrome_net_log.h"
|
| #include "chrome/browser/net/chrome_network_delegate.h"
|
| #include "chrome/browser/net/connection_tester.h"
|
| +#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
|
| +#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
|
| #include "chrome/browser/prerender/prerender_manager.h"
|
| #include "chrome/browser/prerender/prerender_manager_factory.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -44,6 +46,7 @@
|
| #include "chrome/common/chrome_version_info.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
|
| +#include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
|
| #include "components/onc/onc_constants.h"
|
| #include "components/url_fixer/url_fixer.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -215,6 +218,7 @@ class NetInternalsMessageHandler
|
| void OnGetPrerenderInfo(const base::ListValue* list);
|
| void OnGetHistoricNetworkStats(const base::ListValue* list);
|
| void OnGetExtensionInfo(const base::ListValue* list);
|
| + void OnGetDataReductionProxyInfo(const base::ListValue* list);
|
| #if defined(OS_CHROMEOS)
|
| void OnRefreshSystemLogs(const base::ListValue* list);
|
| void OnGetSystemLog(const base::ListValue* list);
|
| @@ -579,6 +583,10 @@ void NetInternalsMessageHandler::RegisterMessages() {
|
| "getExtensionInfo",
|
| base::Bind(&NetInternalsMessageHandler::OnGetExtensionInfo,
|
| base::Unretained(this)));
|
| + web_ui()->RegisterMessageCallback(
|
| + "getDataReductionProxyInfo",
|
| + base::Bind(&NetInternalsMessageHandler::OnGetDataReductionProxyInfo,
|
| + base::Unretained(this)));
|
| #if defined(OS_CHROMEOS)
|
| web_ui()->RegisterMessageCallback(
|
| "refreshSystemLogs",
|
| @@ -685,6 +693,19 @@ void NetInternalsMessageHandler::OnGetExtensionInfo(
|
| SendJavascriptCommand("receivedExtensionInfo", extension_list);
|
| }
|
|
|
| +void NetInternalsMessageHandler::OnGetDataReductionProxyInfo(
|
| + const base::ListValue* list) {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| + Profile* profile = Profile::FromWebUI(web_ui());
|
| + DataReductionProxyChromeSettings* data_reduction_proxy_settings =
|
| + DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile);
|
| + data_reduction_proxy::DataReductionProxyEventStore* event_store =
|
| + data_reduction_proxy_settings->GetEventStore();
|
| + SendJavascriptCommand(
|
| + "receivedDataReductionProxyInfo",
|
| + (event_store == nullptr) ? nullptr : event_store->GetSummaryValue());
|
| +}
|
| +
|
| #if defined(OS_CHROMEOS)
|
| ////////////////////////////////////////////////////////////////////////////////
|
| //
|
| @@ -1431,6 +1452,9 @@ base::Value* NetInternalsUI::GetConstants() {
|
| CommandLine::ForCurrentProcess()->GetCommandLineString());
|
|
|
| constants_dict->Set("clientInfo", dict);
|
| +
|
| + data_reduction_proxy::DataReductionProxyEventStore::AddConstants(
|
| + constants_dict.get());
|
| }
|
|
|
| return constants_dict.release();
|
|
|