Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Side by Side Diff: chrome/browser/chromeos/cros/network_library.cc

Issue 8759014: Add ONC VPN support for OpenVPN and L2TP/IPsec VPNs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/cros/network_library.h" 5 #include "chrome/browser/chromeos/cros/network_library.h"
6 6
7 #include <dbus/dbus-glib.h> 7 #include <dbus/dbus-glib.h>
8 #include <dbus/dbus-gtype-specialized.h> 8 #include <dbus/dbus-gtype-specialized.h>
9 #include <glib-object.h> 9 #include <glib-object.h>
10 10
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 user_passphrase, &user_passphrase_); 799 user_passphrase, &user_passphrase_);
800 SetStringProperty(flimflam::kL2tpIpsecGroupNameProperty, 800 SetStringProperty(flimflam::kL2tpIpsecGroupNameProperty,
801 group_name, &group_name_); 801 group_name, &group_name_);
802 } 802 }
803 803
804 void VirtualNetwork::SetOpenVPNCredentials( 804 void VirtualNetwork::SetOpenVPNCredentials(
805 const std::string& client_cert_id, 805 const std::string& client_cert_id,
806 const std::string& username, 806 const std::string& username,
807 const std::string& user_passphrase, 807 const std::string& user_passphrase,
808 const std::string& otp) { 808 const std::string& otp) {
809 // TODO(kmixter): Are we missing setting the CaCert property?
809 SetStringProperty(flimflam::kOpenVPNClientCertIdProperty, 810 SetStringProperty(flimflam::kOpenVPNClientCertIdProperty,
810 client_cert_id, &client_cert_id_); 811 client_cert_id, &client_cert_id_);
811 SetStringProperty(flimflam::kOpenVPNUserProperty, username, &username_); 812 SetStringProperty(flimflam::kOpenVPNUserProperty, username, &username_);
812 SetStringProperty(flimflam::kOpenVPNPasswordProperty, 813 SetStringProperty(flimflam::kOpenVPNPasswordProperty,
813 user_passphrase, &user_passphrase_); 814 user_passphrase, &user_passphrase_);
814 SetStringProperty(flimflam::kOpenVPNOTPProperty, otp, NULL); 815 SetStringProperty(flimflam::kOpenVPNOTPProperty, otp, NULL);
815 } 816 }
816 817
817 void VirtualNetwork::SetCertificateSlotAndPin( 818 void VirtualNetwork::SetCertificateSlotAndPin(
818 const std::string& slot, const std::string& pin) { 819 const std::string& slot, const std::string& pin) {
(...skipping 4434 matching lines...) Expand 10 before | Expand all | Expand 10 after
5253 return impl; 5254 return impl;
5254 } 5255 }
5255 5256
5256 ///////////////////////////////////////////////////////////////////////////// 5257 /////////////////////////////////////////////////////////////////////////////
5257 5258
5258 } // namespace chromeos 5259 } // namespace chromeos
5259 5260
5260 // Allows InvokeLater without adding refcounting. This class is a Singleton and 5261 // Allows InvokeLater without adding refcounting. This class is a Singleton and
5261 // won't be deleted until its last InvokeLater is run. 5262 // won't be deleted until its last InvokeLater is run.
5262 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImplBase); 5263 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImplBase);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698