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 40038be1d2c4c43e54d9fb1d1e4426810885e9fc..48f4e9a50aef0f0c6bdc0b3aa5f44372fa517088 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" |
@@ -214,6 +216,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); |
@@ -302,6 +305,8 @@ class NetInternalsMessageHandler |
scoped_refptr<IOThreadImpl> proxy_; |
base::WeakPtr<prerender::PrerenderManager> prerender_manager_; |
+ data_reduction_proxy::DataReductionProxyEventStore* |
+ data_reduction_proxy_event_store_; |
mmenke
2014/12/05 16:18:25
This doesn't need to be a member variable, does it
jeremyim
2014/12/05 21:31:12
Done.
|
#if defined(OS_CHROMEOS) |
// Class that handles getting and filtering system logs. |
@@ -499,6 +504,12 @@ void NetInternalsMessageHandler::RegisterMessages() { |
prerender_manager_ = base::WeakPtr<prerender::PrerenderManager>(); |
} |
+ DataReductionProxyChromeSettings* data_reduction_proxy_settings = |
+ DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile); |
+ data_reduction_proxy_event_store_ = |
+ data_reduction_proxy_settings->GetEventStore(); |
+ |
+ |
web_ui()->RegisterMessageCallback( |
"notifyReady", |
base::Bind(&NetInternalsMessageHandler::OnRendererReady, |
@@ -578,6 +589,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", |
@@ -684,6 +699,13 @@ void NetInternalsMessageHandler::OnGetExtensionInfo( |
SendJavascriptCommand("receivedExtensionInfo", extension_list); |
} |
+void NetInternalsMessageHandler::OnGetDataReductionProxyInfo( |
+ const base::ListValue* list) { |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
+ base::Value* value = data_reduction_proxy_event_store_->GetSummaryValue(); |
+ SendJavascriptCommand("receivedDataReductionProxyInfo", value); |
+} |
+ |
#if defined(OS_CHROMEOS) |
//////////////////////////////////////////////////////////////////////////////// |
// |