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

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 19 matching lines...) Expand all
30 #include "base/values.h" 30 #include "base/values.h"
31 #include "chrome/browser/browser_process.h" 31 #include "chrome/browser/browser_process.h"
32 #include "chrome/browser/browsing_data/browsing_data_helper.h" 32 #include "chrome/browser/browsing_data/browsing_data_helper.h"
33 #include "chrome/browser/browsing_data/browsing_data_remover.h" 33 #include "chrome/browser/browsing_data/browsing_data_remover.h"
34 #include "chrome/browser/chrome_notification_types.h" 34 #include "chrome/browser/chrome_notification_types.h"
35 #include "chrome/browser/download/download_prefs.h" 35 #include "chrome/browser/download/download_prefs.h"
36 #include "chrome/browser/io_thread.h" 36 #include "chrome/browser/io_thread.h"
37 #include "chrome/browser/net/chrome_net_log.h" 37 #include "chrome/browser/net/chrome_net_log.h"
38 #include "chrome/browser/net/chrome_network_delegate.h" 38 #include "chrome/browser/net/chrome_network_delegate.h"
39 #include "chrome/browser/net/connection_tester.h" 39 #include "chrome/browser/net/connection_tester.h"
40 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
41 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
40 #include "chrome/browser/prerender/prerender_manager.h" 42 #include "chrome/browser/prerender/prerender_manager.h"
41 #include "chrome/browser/prerender/prerender_manager_factory.h" 43 #include "chrome/browser/prerender/prerender_manager_factory.h"
42 #include "chrome/browser/profiles/profile.h" 44 #include "chrome/browser/profiles/profile.h"
43 #include "chrome/common/chrome_paths.h" 45 #include "chrome/common/chrome_paths.h"
44 #include "chrome/common/chrome_version_info.h" 46 #include "chrome/common/chrome_version_info.h"
45 #include "chrome/common/url_constants.h" 47 #include "chrome/common/url_constants.h"
46 #include "components/onc/onc_constants.h" 48 #include "components/onc/onc_constants.h"
47 #include "components/url_fixer/url_fixer.h" 49 #include "components/url_fixer/url_fixer.h"
48 #include "content/public/browser/browser_thread.h" 50 #include "content/public/browser/browser_thread.h"
49 #include "content/public/browser/notification_details.h" 51 #include "content/public/browser/notification_details.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // Takes ownership of |arg|. If the renderer is displaying a log file, the 209 // Takes ownership of |arg|. If the renderer is displaying a log file, the
208 // message will be ignored. 210 // message will be ignored.
209 void SendJavascriptCommand(const std::string& command, base::Value* arg); 211 void SendJavascriptCommand(const std::string& command, base::Value* arg);
210 212
211 // Javascript message handlers. 213 // Javascript message handlers.
212 void OnRendererReady(const base::ListValue* list); 214 void OnRendererReady(const base::ListValue* list);
213 void OnClearBrowserCache(const base::ListValue* list); 215 void OnClearBrowserCache(const base::ListValue* list);
214 void OnGetPrerenderInfo(const base::ListValue* list); 216 void OnGetPrerenderInfo(const base::ListValue* list);
215 void OnGetHistoricNetworkStats(const base::ListValue* list); 217 void OnGetHistoricNetworkStats(const base::ListValue* list);
216 void OnGetExtensionInfo(const base::ListValue* list); 218 void OnGetExtensionInfo(const base::ListValue* list);
219 void OnGetDataReductionProxyInfo(const base::ListValue* list);
217 #if defined(OS_CHROMEOS) 220 #if defined(OS_CHROMEOS)
218 void OnRefreshSystemLogs(const base::ListValue* list); 221 void OnRefreshSystemLogs(const base::ListValue* list);
219 void OnGetSystemLog(const base::ListValue* list); 222 void OnGetSystemLog(const base::ListValue* list);
220 void OnImportONCFile(const base::ListValue* list); 223 void OnImportONCFile(const base::ListValue* list);
221 void OnStoreDebugLogs(const base::ListValue* list); 224 void OnStoreDebugLogs(const base::ListValue* list);
222 void OnStoreDebugLogsCompleted(const base::FilePath& log_path, 225 void OnStoreDebugLogsCompleted(const base::FilePath& log_path,
223 bool succeeded); 226 bool succeeded);
224 void OnSetNetworkDebugMode(const base::ListValue* list); 227 void OnSetNetworkDebugMode(const base::ListValue* list);
225 void OnSetNetworkDebugModeCompleted(const std::string& subsystem, 228 void OnSetNetworkDebugModeCompleted(const std::string& subsystem,
226 bool succeeded); 229 bool succeeded);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 base::CancelableTaskTracker tracker_; 298 base::CancelableTaskTracker tracker_;
296 // Libcros request task ID. 299 // Libcros request task ID.
297 base::CancelableTaskTracker::TaskId syslogs_task_id_; 300 base::CancelableTaskTracker::TaskId syslogs_task_id_;
298 }; 301 };
299 #endif // defined(OS_CHROMEOS) 302 #endif // defined(OS_CHROMEOS)
300 303
301 // This is the "real" message handler, which lives on the IO thread. 304 // This is the "real" message handler, which lives on the IO thread.
302 scoped_refptr<IOThreadImpl> proxy_; 305 scoped_refptr<IOThreadImpl> proxy_;
303 306
304 base::WeakPtr<prerender::PrerenderManager> prerender_manager_; 307 base::WeakPtr<prerender::PrerenderManager> prerender_manager_;
308 data_reduction_proxy::DataReductionProxyEventStore*
309 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.
305 310
306 #if defined(OS_CHROMEOS) 311 #if defined(OS_CHROMEOS)
307 // Class that handles getting and filtering system logs. 312 // Class that handles getting and filtering system logs.
308 scoped_ptr<SystemLogsGetter> syslogs_getter_; 313 scoped_ptr<SystemLogsGetter> syslogs_getter_;
309 #endif 314 #endif
310 315
311 DISALLOW_COPY_AND_ASSIGN(NetInternalsMessageHandler); 316 DISALLOW_COPY_AND_ASSIGN(NetInternalsMessageHandler);
312 }; 317 };
313 318
314 // This class is the "real" message handler. It is allocated and destroyed on 319 // This class is the "real" message handler. It is allocated and destroyed on
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 #endif 497 #endif
493 498
494 prerender::PrerenderManager* prerender_manager = 499 prerender::PrerenderManager* prerender_manager =
495 prerender::PrerenderManagerFactory::GetForProfile(profile); 500 prerender::PrerenderManagerFactory::GetForProfile(profile);
496 if (prerender_manager) { 501 if (prerender_manager) {
497 prerender_manager_ = prerender_manager->AsWeakPtr(); 502 prerender_manager_ = prerender_manager->AsWeakPtr();
498 } else { 503 } else {
499 prerender_manager_ = base::WeakPtr<prerender::PrerenderManager>(); 504 prerender_manager_ = base::WeakPtr<prerender::PrerenderManager>();
500 } 505 }
501 506
507 DataReductionProxyChromeSettings* data_reduction_proxy_settings =
508 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile);
509 data_reduction_proxy_event_store_ =
510 data_reduction_proxy_settings->GetEventStore();
511
512
502 web_ui()->RegisterMessageCallback( 513 web_ui()->RegisterMessageCallback(
503 "notifyReady", 514 "notifyReady",
504 base::Bind(&NetInternalsMessageHandler::OnRendererReady, 515 base::Bind(&NetInternalsMessageHandler::OnRendererReady,
505 base::Unretained(this))); 516 base::Unretained(this)));
506 web_ui()->RegisterMessageCallback( 517 web_ui()->RegisterMessageCallback(
507 "getNetInfo", 518 "getNetInfo",
508 base::Bind(&IOThreadImpl::CallbackHelper, 519 base::Bind(&IOThreadImpl::CallbackHelper,
509 &IOThreadImpl::OnGetNetInfo, proxy_)); 520 &IOThreadImpl::OnGetNetInfo, proxy_));
510 web_ui()->RegisterMessageCallback( 521 web_ui()->RegisterMessageCallback(
511 "reloadProxySettings", 522 "reloadProxySettings",
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 base::Bind(&NetInternalsMessageHandler::OnGetPrerenderInfo, 582 base::Bind(&NetInternalsMessageHandler::OnGetPrerenderInfo,
572 base::Unretained(this))); 583 base::Unretained(this)));
573 web_ui()->RegisterMessageCallback( 584 web_ui()->RegisterMessageCallback(
574 "getHistoricNetworkStats", 585 "getHistoricNetworkStats",
575 base::Bind(&NetInternalsMessageHandler::OnGetHistoricNetworkStats, 586 base::Bind(&NetInternalsMessageHandler::OnGetHistoricNetworkStats,
576 base::Unretained(this))); 587 base::Unretained(this)));
577 web_ui()->RegisterMessageCallback( 588 web_ui()->RegisterMessageCallback(
578 "getExtensionInfo", 589 "getExtensionInfo",
579 base::Bind(&NetInternalsMessageHandler::OnGetExtensionInfo, 590 base::Bind(&NetInternalsMessageHandler::OnGetExtensionInfo,
580 base::Unretained(this))); 591 base::Unretained(this)));
592 web_ui()->RegisterMessageCallback(
593 "getDataReductionProxyInfo",
594 base::Bind(&NetInternalsMessageHandler::OnGetDataReductionProxyInfo,
595 base::Unretained(this)));
581 #if defined(OS_CHROMEOS) 596 #if defined(OS_CHROMEOS)
582 web_ui()->RegisterMessageCallback( 597 web_ui()->RegisterMessageCallback(
583 "refreshSystemLogs", 598 "refreshSystemLogs",
584 base::Bind(&NetInternalsMessageHandler::OnRefreshSystemLogs, 599 base::Bind(&NetInternalsMessageHandler::OnRefreshSystemLogs,
585 base::Unretained(this))); 600 base::Unretained(this)));
586 web_ui()->RegisterMessageCallback( 601 web_ui()->RegisterMessageCallback(
587 "getSystemLog", 602 "getSystemLog",
588 base::Bind(&NetInternalsMessageHandler::OnGetSystemLog, 603 base::Bind(&NetInternalsMessageHandler::OnGetSystemLog,
589 base::Unretained(this))); 604 base::Unretained(this)));
590 web_ui()->RegisterMessageCallback( 605 web_ui()->RegisterMessageCallback(
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 bool enabled = extension_service->IsExtensionEnabled((*it)->id()); 692 bool enabled = extension_service->IsExtensionEnabled((*it)->id());
678 extensions::GetExtensionBasicInfo(it->get(), enabled, extension_info); 693 extensions::GetExtensionBasicInfo(it->get(), enabled, extension_info);
679 extension_list->Append(extension_info); 694 extension_list->Append(extension_info);
680 } 695 }
681 } 696 }
682 } 697 }
683 #endif 698 #endif
684 SendJavascriptCommand("receivedExtensionInfo", extension_list); 699 SendJavascriptCommand("receivedExtensionInfo", extension_list);
685 } 700 }
686 701
702 void NetInternalsMessageHandler::OnGetDataReductionProxyInfo(
703 const base::ListValue* list) {
704 DCHECK_CURRENTLY_ON(BrowserThread::UI);
705 base::Value* value = data_reduction_proxy_event_store_->GetSummaryValue();
706 SendJavascriptCommand("receivedDataReductionProxyInfo", value);
707 }
708
687 #if defined(OS_CHROMEOS) 709 #if defined(OS_CHROMEOS)
688 //////////////////////////////////////////////////////////////////////////////// 710 ////////////////////////////////////////////////////////////////////////////////
689 // 711 //
690 // NetInternalsMessageHandler::SystemLogsGetter 712 // NetInternalsMessageHandler::SystemLogsGetter
691 // 713 //
692 //////////////////////////////////////////////////////////////////////////////// 714 ////////////////////////////////////////////////////////////////////////////////
693 715
694 NetInternalsMessageHandler::SystemLogsGetter::SystemLogsGetter( 716 NetInternalsMessageHandler::SystemLogsGetter::SystemLogsGetter(
695 NetInternalsMessageHandler* handler, 717 NetInternalsMessageHandler* handler,
696 chromeos::system::SyslogsProvider* syslogs_provider) 718 chromeos::system::SyslogsProvider* syslogs_provider)
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 } 1458 }
1437 1459
1438 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1460 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1439 : WebUIController(web_ui) { 1461 : WebUIController(web_ui) {
1440 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 1462 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
1441 1463
1442 // Set up the chrome://net-internals/ source. 1464 // Set up the chrome://net-internals/ source.
1443 Profile* profile = Profile::FromWebUI(web_ui); 1465 Profile* profile = Profile::FromWebUI(web_ui);
1444 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource()); 1466 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
1445 } 1467 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698