| 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/chromeos/options/vpn_config_view.h" | 5 #include "chrome/browser/chromeos/options/vpn_config_view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
| 12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "chrome/browser/chromeos/enrollment_dialog_view.h" | 14 #include "chrome/browser/chromeos/enrollment_dialog_view.h" |
| 15 #include "chrome/browser/chromeos/net/onc_utils.h" | |
| 16 #include "chrome/browser/chromeos/net/shill_error.h" | 15 #include "chrome/browser/chromeos/net/shill_error.h" |
| 17 #include "chrome/browser/profiles/profile_manager.h" | 16 #include "chrome/browser/profiles/profile_manager.h" |
| 18 #include "chrome/common/net/x509_certificate_model.h" | 17 #include "chrome/common/net/x509_certificate_model.h" |
| 19 #include "chrome/grit/generated_resources.h" | 18 #include "chrome/grit/generated_resources.h" |
| 20 #include "chromeos/login/login_state.h" | 19 #include "chromeos/login/login_state.h" |
| 21 #include "chromeos/network/network_configuration_handler.h" | 20 #include "chromeos/network/network_configuration_handler.h" |
| 22 #include "chromeos/network/network_connect.h" | 21 #include "chromeos/network/network_connect.h" |
| 23 #include "chromeos/network/network_event_log.h" | 22 #include "chromeos/network/network_event_log.h" |
| 24 #include "chromeos/network/network_state.h" | 23 #include "chromeos/network/network_state.h" |
| 25 #include "chromeos/network/network_state_handler.h" | 24 #include "chromeos/network/network_state_handler.h" |
| 26 #include "chromeos/network/network_ui_data.h" | 25 #include "chromeos/network/network_ui_data.h" |
| 26 #include "chromeos/network/onc/onc_utils.h" |
| 27 #include "components/onc/onc_constants.h" | 27 #include "components/onc/onc_constants.h" |
| 28 #include "third_party/cros_system_api/dbus/service_constants.h" | 28 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 29 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
| 30 #include "ui/base/models/combobox_model.h" | 30 #include "ui/base/models/combobox_model.h" |
| 31 #include "ui/events/event.h" | 31 #include "ui/events/event.h" |
| 32 #include "ui/views/controls/button/checkbox.h" | 32 #include "ui/views/controls/button/checkbox.h" |
| 33 #include "ui/views/controls/combobox/combobox.h" | 33 #include "ui/views/controls/combobox/combobox.h" |
| 34 #include "ui/views/controls/label.h" | 34 #include "ui/views/controls/label.h" |
| 35 #include "ui/views/controls/textfield/textfield.h" | 35 #include "ui/views/controls/textfield/textfield.h" |
| 36 #include "ui/views/layout/grid_layout.h" | 36 #include "ui/views/layout/grid_layout.h" |
| (...skipping 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1069 property_ui_data->ParseOncProperty( | 1069 property_ui_data->ParseOncProperty( |
| 1070 onc_source, | 1070 onc_source, |
| 1071 onc, | 1071 onc, |
| 1072 base::StringPrintf("%s.%s.%s", | 1072 base::StringPrintf("%s.%s.%s", |
| 1073 ::onc::network_config::kVPN, | 1073 ::onc::network_config::kVPN, |
| 1074 dict_key.c_str(), | 1074 dict_key.c_str(), |
| 1075 key.c_str())); | 1075 key.c_str())); |
| 1076 } | 1076 } |
| 1077 | 1077 |
| 1078 } // namespace chromeos | 1078 } // namespace chromeos |
| OLD | NEW |