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 "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/chromeos/cros/cros_library.h" | 10 #include "chrome/browser/chromeos/cros/cros_library.h" |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 const ui::KeyEvent& key_event) { | 271 const ui::KeyEvent& key_event) { |
272 if ((sender == psk_passphrase_textfield_ || | 272 if ((sender == psk_passphrase_textfield_ || |
273 sender == user_passphrase_textfield_) && | 273 sender == user_passphrase_textfield_) && |
274 key_event.key_code() == ui::VKEY_RETURN) { | 274 key_event.key_code() == ui::VKEY_RETURN) { |
275 parent_->GetDialogClientView()->AcceptWindow(); | 275 parent_->GetDialogClientView()->AcceptWindow(); |
276 } | 276 } |
277 return false; | 277 return false; |
278 } | 278 } |
279 | 279 |
280 void VPNConfigView::ButtonPressed(views::Button* sender, | 280 void VPNConfigView::ButtonPressed(views::Button* sender, |
281 const views::Event& event) { | 281 const ui::Event& event) { |
282 } | 282 } |
283 | 283 |
284 void VPNConfigView::OnSelectedIndexChanged(views::Combobox* combobox) { | 284 void VPNConfigView::OnSelectedIndexChanged(views::Combobox* combobox) { |
285 if (combobox == provider_type_combobox_) { | 285 if (combobox == provider_type_combobox_) { |
286 provider_type_ = static_cast<ProviderType>(combobox->selected_index()); | 286 provider_type_ = static_cast<ProviderType>(combobox->selected_index()); |
287 UpdateControls(); | 287 UpdateControls(); |
288 } else if (combobox == user_cert_combobox_ || | 288 } else if (combobox == user_cert_combobox_ || |
289 combobox == server_ca_cert_combobox_) { | 289 combobox == server_ca_cert_combobox_) { |
290 // Do nothing. | 290 // Do nothing. |
291 } else { | 291 } else { |
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
889 NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary(); | 889 NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary(); |
890 const base::DictionaryValue* onc = | 890 const base::DictionaryValue* onc = |
891 network_library->FindOncForNetwork(network->unique_id()); | 891 network_library->FindOncForNetwork(network->unique_id()); |
892 | 892 |
893 property_ui_data->ParseOncProperty( | 893 property_ui_data->ParseOncProperty( |
894 network->ui_data(), onc, | 894 network->ui_data(), onc, |
895 base::StringPrintf("%s.%s.%s", onc::kVPN, dict_key.c_str(), key.c_str())); | 895 base::StringPrintf("%s.%s.%s", onc::kVPN, dict_key.c_str(), key.c_str())); |
896 } | 896 } |
897 | 897 |
898 } // namespace chromeos | 898 } // namespace chromeos |
OLD | NEW |