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

Side by Side Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 775773002: Add data reduction proxy debug info to net-internals#bandwidth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 void OnHSTSQuery(const base::ListValue* list); 368 void OnHSTSQuery(const base::ListValue* list);
369 void OnHSTSAdd(const base::ListValue* list); 369 void OnHSTSAdd(const base::ListValue* list);
370 void OnHSTSDelete(const base::ListValue* list); 370 void OnHSTSDelete(const base::ListValue* list);
371 void OnGetSessionNetworkStats(const base::ListValue* list); 371 void OnGetSessionNetworkStats(const base::ListValue* list);
372 void OnCloseIdleSockets(const base::ListValue* list); 372 void OnCloseIdleSockets(const base::ListValue* list);
373 void OnFlushSocketPools(const base::ListValue* list); 373 void OnFlushSocketPools(const base::ListValue* list);
374 #if defined(OS_WIN) 374 #if defined(OS_WIN)
375 void OnGetServiceProviders(const base::ListValue* list); 375 void OnGetServiceProviders(const base::ListValue* list);
376 #endif 376 #endif
377 void OnSetLogLevel(const base::ListValue* list); 377 void OnSetLogLevel(const base::ListValue* list);
378 void OnGetDataReductionProxyInfo(const base::ListValue* list);
378 379
379 // ChromeNetLog::ThreadSafeObserver implementation: 380 // ChromeNetLog::ThreadSafeObserver implementation:
380 void OnAddEntry(const net::NetLog::Entry& entry) override; 381 void OnAddEntry(const net::NetLog::Entry& entry) override;
381 382
382 // ConnectionTester::Delegate implementation: 383 // ConnectionTester::Delegate implementation:
383 void OnStartConnectionTestSuite() override; 384 void OnStartConnectionTestSuite() override;
384 void OnStartConnectionTestExperiment( 385 void OnStartConnectionTestExperiment(
385 const ConnectionTester::Experiment& experiment) override; 386 const ConnectionTester::Experiment& experiment) override;
386 void OnCompletedConnectionTestExperiment( 387 void OnCompletedConnectionTestExperiment(
387 const ConnectionTester::Experiment& experiment, 388 const ConnectionTester::Experiment& experiment,
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 base::Bind(&NetInternalsMessageHandler::OnGetPrerenderInfo, 572 base::Bind(&NetInternalsMessageHandler::OnGetPrerenderInfo,
572 base::Unretained(this))); 573 base::Unretained(this)));
573 web_ui()->RegisterMessageCallback( 574 web_ui()->RegisterMessageCallback(
574 "getHistoricNetworkStats", 575 "getHistoricNetworkStats",
575 base::Bind(&NetInternalsMessageHandler::OnGetHistoricNetworkStats, 576 base::Bind(&NetInternalsMessageHandler::OnGetHistoricNetworkStats,
576 base::Unretained(this))); 577 base::Unretained(this)));
577 web_ui()->RegisterMessageCallback( 578 web_ui()->RegisterMessageCallback(
578 "getExtensionInfo", 579 "getExtensionInfo",
579 base::Bind(&NetInternalsMessageHandler::OnGetExtensionInfo, 580 base::Bind(&NetInternalsMessageHandler::OnGetExtensionInfo,
580 base::Unretained(this))); 581 base::Unretained(this)));
582 web_ui()->RegisterMessageCallback(
583 "getDataReductionProxyInfo",
584 base::Bind(&IOThreadImpl::CallbackHelper,
585 &IOThreadImpl::OnGetDataReductionProxyInfo, proxy_));
581 #if defined(OS_CHROMEOS) 586 #if defined(OS_CHROMEOS)
582 web_ui()->RegisterMessageCallback( 587 web_ui()->RegisterMessageCallback(
583 "refreshSystemLogs", 588 "refreshSystemLogs",
584 base::Bind(&NetInternalsMessageHandler::OnRefreshSystemLogs, 589 base::Bind(&NetInternalsMessageHandler::OnRefreshSystemLogs,
585 base::Unretained(this))); 590 base::Unretained(this)));
586 web_ui()->RegisterMessageCallback( 591 web_ui()->RegisterMessageCallback(
587 "getSystemLog", 592 "getSystemLog",
588 base::Bind(&NetInternalsMessageHandler::OnGetSystemLog, 593 base::Bind(&NetInternalsMessageHandler::OnGetSystemLog,
589 base::Unretained(this))); 594 base::Unretained(this)));
590 web_ui()->RegisterMessageCallback( 595 web_ui()->RegisterMessageCallback(
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 NOTREACHED(); 1290 NOTREACHED();
1286 return; 1291 return;
1287 } 1292 }
1288 1293
1289 DCHECK_GE(log_level, net::NetLog::LOG_ALL); 1294 DCHECK_GE(log_level, net::NetLog::LOG_ALL);
1290 DCHECK_LT(log_level, net::NetLog::LOG_NONE); 1295 DCHECK_LT(log_level, net::NetLog::LOG_NONE);
1291 net_log()->SetObserverLogLevel( 1296 net_log()->SetObserverLogLevel(
1292 this, static_cast<net::NetLog::LogLevel>(log_level)); 1297 this, static_cast<net::NetLog::LogLevel>(log_level));
1293 } 1298 }
1294 1299
1300 void NetInternalsMessageHandler::IOThreadImpl::OnGetDataReductionProxyInfo(
1301 const base::ListValue* list) {
1302 DCHECK(!list);
1303 net::HttpNetworkSession* http_network_session =
1304 GetHttpNetworkSession(main_context_getter_->GetURLRequestContext());
1305
1306 base::Value* data_reduction_proxy_info = NULL;
mmenke 2014/12/03 18:58:46 I believe nullptr is now preferred
jeremyim 2014/12/03 20:57:26 Done.
1307 if (http_network_session) {
1308 ChromeNetworkDelegate* network_delegate =
1309 static_cast<ChromeNetworkDelegate*>(
1310 http_network_session->network_delegate());
mmenke 2014/12/03 18:58:46 This is a problem. See https://codereview.chromiu
jeremyim 2014/12/03 20:57:26 Yeah, I'm not too thrilled about it either, and th
1311
1312 if (network_delegate)
1313 data_reduction_proxy_info =
1314 network_delegate->DataReductionProxyInfoToValue();
1315 }
1316
1317 SendJavascriptCommand(
1318 "receivedDataReductionProxyInfo", data_reduction_proxy_info);
1319 }
1320
1295 // Note that unlike other methods of IOThreadImpl, this function 1321 // Note that unlike other methods of IOThreadImpl, this function
1296 // can be called from ANY THREAD. 1322 // can be called from ANY THREAD.
1297 void NetInternalsMessageHandler::IOThreadImpl::OnAddEntry( 1323 void NetInternalsMessageHandler::IOThreadImpl::OnAddEntry(
1298 const net::NetLog::Entry& entry) { 1324 const net::NetLog::Entry& entry) {
1299 BrowserThread::PostTask( 1325 BrowserThread::PostTask(
1300 BrowserThread::IO, FROM_HERE, 1326 BrowserThread::IO, FROM_HERE,
1301 base::Bind(&IOThreadImpl::AddEntryToQueue, this, entry.ToValue())); 1327 base::Bind(&IOThreadImpl::AddEntryToQueue, this, entry.ToValue()));
1302 } 1328 }
1303 1329
1304 void NetInternalsMessageHandler::IOThreadImpl::OnStartConnectionTestSuite() { 1330 void NetInternalsMessageHandler::IOThreadImpl::OnStartConnectionTestSuite() {
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 } 1462 }
1437 1463
1438 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1464 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1439 : WebUIController(web_ui) { 1465 : WebUIController(web_ui) {
1440 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 1466 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
1441 1467
1442 // Set up the chrome://net-internals/ source. 1468 // Set up the chrome://net-internals/ source.
1443 Profile* profile = Profile::FromWebUI(web_ui); 1469 Profile* profile = Profile::FromWebUI(web_ui);
1444 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource()); 1470 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
1445 } 1471 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698