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

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

Issue 1084533002: Rename NetLogLogger and CapturingNetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename NetLogLogger and CapturingNetLog(removed compiler error for chromeOS) Created 5 years, 8 months 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "net/base/net_util.h" 61 #include "net/base/net_util.h"
62 #include "net/disk_cache/disk_cache.h" 62 #include "net/disk_cache/disk_cache.h"
63 #include "net/dns/host_cache.h" 63 #include "net/dns/host_cache.h"
64 #include "net/dns/host_resolver.h" 64 #include "net/dns/host_resolver.h"
65 #include "net/http/http_cache.h" 65 #include "net/http/http_cache.h"
66 #include "net/http/http_network_layer.h" 66 #include "net/http/http_network_layer.h"
67 #include "net/http/http_network_session.h" 67 #include "net/http/http_network_session.h"
68 #include "net/http/http_server_properties.h" 68 #include "net/http/http_server_properties.h"
69 #include "net/http/http_stream_factory.h" 69 #include "net/http/http_stream_factory.h"
70 #include "net/http/transport_security_state.h" 70 #include "net/http/transport_security_state.h"
71 #include "net/log/net_log_logger.h"
72 #include "net/log/net_log_util.h" 71 #include "net/log/net_log_util.h"
72 #include "net/log/write_to_file_net_log_observer.h"
73 #include "net/proxy/proxy_service.h" 73 #include "net/proxy/proxy_service.h"
74 #include "net/url_request/url_request_context.h" 74 #include "net/url_request/url_request_context.h"
75 #include "net/url_request/url_request_context_getter.h" 75 #include "net/url_request/url_request_context_getter.h"
76 76
77 #if defined(OS_CHROMEOS) 77 #if defined(OS_CHROMEOS)
78 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h" 78 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
79 #include "chrome/browser/chromeos/net/onc_utils.h" 79 #include "chrome/browser/chromeos/net/onc_utils.h"
80 #include "chrome/browser/chromeos/profiles/profile_helper.h" 80 #include "chrome/browser/chromeos/profiles/profile_helper.h"
81 #include "chrome/browser/chromeos/system_logs/debug_log_writer.h" 81 #include "chrome/browser/chromeos/system_logs/debug_log_writer.h"
82 #include "chrome/browser/net/nss_context.h" 82 #include "chrome/browser/net/nss_context.h"
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 } 1202 }
1203 1203
1204 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) 1204 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
1205 : WebUIController(web_ui) { 1205 : WebUIController(web_ui) {
1206 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); 1206 web_ui->AddMessageHandler(new NetInternalsMessageHandler());
1207 1207
1208 // Set up the chrome://net-internals/ source. 1208 // Set up the chrome://net-internals/ source.
1209 Profile* profile = Profile::FromWebUI(web_ui); 1209 Profile* profile = Profile::FromWebUI(web_ui);
1210 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource()); 1210 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
1211 } 1211 }
OLDNEW
« no previous file with comments | « chrome/browser/net/net_log_temp_file.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698