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 "ash/system/chromeos/network/network_connect.h" | 7 #include "ash/system/chromeos/network/network_connect.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
12 #include "chrome/browser/chromeos/enrollment_dialog_view.h" | 12 #include "chrome/browser/chromeos/enrollment_dialog_view.h" |
13 #include "chrome/browser/chromeos/net/onc_utils.h" | 13 #include "chrome/browser/chromeos/net/onc_utils.h" |
14 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
15 #include "chrome/common/net/x509_certificate_model.h" | 15 #include "chrome/common/net/x509_certificate_model.h" |
16 #include "chrome/grit/generated_resources.h" | 16 #include "chrome/grit/generated_resources.h" |
17 #include "chrome/grit/locale_settings.h" | |
18 #include "chrome/grit/theme_resources.h" | |
19 #include "chromeos/login/login_state.h" | 17 #include "chromeos/login/login_state.h" |
20 #include "chromeos/network/network_configuration_handler.h" | 18 #include "chromeos/network/network_configuration_handler.h" |
21 #include "chromeos/network/network_event_log.h" | 19 #include "chromeos/network/network_event_log.h" |
22 #include "chromeos/network/network_state.h" | 20 #include "chromeos/network/network_state.h" |
23 #include "chromeos/network/network_state_handler.h" | 21 #include "chromeos/network/network_state_handler.h" |
24 #include "chromeos/network/network_ui_data.h" | 22 #include "chromeos/network/network_ui_data.h" |
25 #include "components/onc/onc_constants.h" | 23 #include "components/onc/onc_constants.h" |
26 #include "third_party/cros_system_api/dbus/service_constants.h" | 24 #include "third_party/cros_system_api/dbus/service_constants.h" |
27 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
28 #include "ui/base/models/combobox_model.h" | 26 #include "ui/base/models/combobox_model.h" |
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1062 property_ui_data->ParseOncProperty( | 1060 property_ui_data->ParseOncProperty( |
1063 onc_source, | 1061 onc_source, |
1064 onc, | 1062 onc, |
1065 base::StringPrintf("%s.%s.%s", | 1063 base::StringPrintf("%s.%s.%s", |
1066 ::onc::network_config::kVPN, | 1064 ::onc::network_config::kVPN, |
1067 dict_key.c_str(), | 1065 dict_key.c_str(), |
1068 key.c_str())); | 1066 key.c_str())); |
1069 } | 1067 } |
1070 | 1068 |
1071 } // namespace chromeos | 1069 } // namespace chromeos |
OLD | NEW |