Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 #include "net/log/net_log_capture_mode.h" | 79 #include "net/log/net_log_capture_mode.h" |
| 80 #include "net/log/net_log_entry.h" | 80 #include "net/log/net_log_entry.h" |
| 81 #include "net/log/net_log_util.h" | 81 #include "net/log/net_log_util.h" |
| 82 #include "net/log/write_to_file_net_log_observer.h" | 82 #include "net/log/write_to_file_net_log_observer.h" |
| 83 #include "net/proxy/proxy_service.h" | 83 #include "net/proxy/proxy_service.h" |
| 84 #include "net/url_request/url_request_context.h" | 84 #include "net/url_request/url_request_context.h" |
| 85 #include "net/url_request/url_request_context_getter.h" | 85 #include "net/url_request/url_request_context_getter.h" |
| 86 | 86 |
| 87 #if defined(OS_CHROMEOS) | 87 #if defined(OS_CHROMEOS) |
| 88 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h" | 88 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h" |
| 89 #include "chrome/browser/chromeos/net/onc_utils.h" | |
|
mmenke
2016/10/25 09:33:14
This header looks like it's needed for chromeos::o
stevenjb
2016/10/25 17:26:22
chrome/browser/chromeos/net/onc_utils.h has been m
mmenke
2016/10/25 17:28:28
Sorry, the duplicate file name confused me.
| |
| 90 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 89 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 91 #include "chrome/browser/chromeos/system_logs/debug_log_writer.h" | 90 #include "chrome/browser/chromeos/system_logs/debug_log_writer.h" |
| 92 #include "chrome/browser/net/nss_context.h" | 91 #include "chrome/browser/net/nss_context.h" |
| 93 #include "chromeos/dbus/dbus_thread_manager.h" | 92 #include "chromeos/dbus/dbus_thread_manager.h" |
| 94 #include "chromeos/dbus/debug_daemon_client.h" | 93 #include "chromeos/dbus/debug_daemon_client.h" |
| 95 #include "chromeos/network/onc/onc_certificate_importer_impl.h" | 94 #include "chromeos/network/onc/onc_certificate_importer_impl.h" |
| 96 #include "chromeos/network/onc/onc_utils.h" | 95 #include "chromeos/network/onc/onc_utils.h" |
| 97 #include "components/user_manager/user.h" | 96 #include "components/user_manager/user.h" |
| 98 #endif | 97 #endif |
| 99 | 98 |
| (...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1172 //////////////////////////////////////////////////////////////////////////////// | 1171 //////////////////////////////////////////////////////////////////////////////// |
| 1173 | 1172 |
| 1174 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) | 1173 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) |
| 1175 : WebUIController(web_ui) { | 1174 : WebUIController(web_ui) { |
| 1176 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); | 1175 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); |
| 1177 | 1176 |
| 1178 // Set up the chrome://net-internals/ source. | 1177 // Set up the chrome://net-internals/ source. |
| 1179 Profile* profile = Profile::FromWebUI(web_ui); | 1178 Profile* profile = Profile::FromWebUI(web_ui); |
| 1180 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource()); | 1179 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource()); |
| 1181 } | 1180 } |
| OLD | NEW |