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

Unified Diff: chrome/browser/chromeos/cros/network_library.h

Issue 2869019: Don't generate a certificate browse button or passphrase field if cert path contains SETTINGS: (Closed)
Patch Set: Simplified SETTINGS: parsing. Created 10 years, 6 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/cros/network_library.h
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index d68aeb2ad16aa1c2f6641bfc9e80f56dcaa9e27c..3d8d2864d6c3f117ec26ab23ce76be1466509986 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -306,15 +306,15 @@ class NetworkLibrary {
// Connect to the specified wireless network with password.
virtual void ConnectToWifiNetwork(WifiNetwork network,
- const string16& password,
- const string16& identity,
- const string16& certpath) = 0;
+ const std::string& password,
+ const std::string& identity,
+ const std::string& certpath) = 0;
// Connect to the specified wifi ssid with password.
- virtual void ConnectToWifiNetwork(const string16& ssid,
- const string16& password,
- const string16& identity,
- const string16& certpath,
+ virtual void ConnectToWifiNetwork(const std::string& ssid,
+ const std::string& password,
+ const std::string& identity,
+ const std::string& certpath,
bool auto_connect) = 0;
// Connect to the specified cellular network.
@@ -421,13 +421,13 @@ class NetworkLibraryImpl : public NetworkLibrary,
virtual bool PreferredNetworkConnected();
virtual bool PreferredNetworkFailed();
virtual void ConnectToWifiNetwork(WifiNetwork network,
- const string16& password,
- const string16& identity,
- const string16& certpath);
- virtual void ConnectToWifiNetwork(const string16& ssid,
- const string16& password,
- const string16& identity,
- const string16& certpath,
+ const std::string& password,
+ const std::string& identity,
+ const std::string& certpath);
+ virtual void ConnectToWifiNetwork(const std::string& ssid,
+ const std::string& password,
+ const std::string& identity,
+ const std::string& certpath,
bool auto_connect);
virtual void ConnectToCellularNetwork(CellularNetwork network);
virtual void DisconnectFromWirelessNetwork(const WirelessNetwork& network);

Powered by Google App Engine
This is Rietveld 408576698