| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <list> | 8 #include <list> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1556 base::ListValue certificates; | 1556 base::ListValue certificates; |
| 1557 if (!chromeos::onc::ParseAndValidateOncForImport(onc_blob, | 1557 if (!chromeos::onc::ParseAndValidateOncForImport(onc_blob, |
| 1558 onc_source, | 1558 onc_source, |
| 1559 passcode, | 1559 passcode, |
| 1560 &network_configs, | 1560 &network_configs, |
| 1561 &global_network_config, | 1561 &global_network_config, |
| 1562 &certificates)) { | 1562 &certificates)) { |
| 1563 error = "Errors occurred during the ONC parsing. "; | 1563 error = "Errors occurred during the ONC parsing. "; |
| 1564 } | 1564 } |
| 1565 | 1565 |
| 1566 // XXX |
| 1566 chromeos::onc::CertificateImporterImpl cert_importer; | 1567 chromeos::onc::CertificateImporterImpl cert_importer; |
| 1567 if (!cert_importer.ImportCertificates(certificates, onc_source, NULL)) | 1568 if (!cert_importer.ImportCertificates(certificates, onc_source, NULL)) |
| 1568 error += "Some certificates couldn't be imported. "; | 1569 error += "Some certificates couldn't be imported. "; |
| 1569 | 1570 |
| 1570 std::string network_error; | 1571 std::string network_error; |
| 1571 chromeos::onc::ImportNetworksForUser(user, network_configs, &network_error); | 1572 chromeos::onc::ImportNetworksForUser(user, network_configs, &network_error); |
| 1572 if (!network_error.empty()) | 1573 if (!network_error.empty()) |
| 1573 error += network_error; | 1574 error += network_error; |
| 1574 } else { | 1575 } else { |
| 1575 error = "No active user."; | 1576 error = "No active user."; |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1876 } | 1877 } |
| 1877 | 1878 |
| 1878 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) | 1879 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui) |
| 1879 : WebUIController(web_ui) { | 1880 : WebUIController(web_ui) { |
| 1880 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); | 1881 web_ui->AddMessageHandler(new NetInternalsMessageHandler()); |
| 1881 | 1882 |
| 1882 // Set up the chrome://net-internals/ source. | 1883 // Set up the chrome://net-internals/ source. |
| 1883 Profile* profile = Profile::FromWebUI(web_ui); | 1884 Profile* profile = Profile::FromWebUI(web_ui); |
| 1884 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource()); | 1885 content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource()); |
| 1885 } | 1886 } |
| OLD | NEW |