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

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.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/options/wifi_config_view.h
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index 2e9797150b5ad82122390dac31e05c4070f98c0d..18c0f78183b4c5ae227362497d224f0ea4fb0957 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -54,9 +54,9 @@ class WifiConfigView : public views::View,
virtual bool Save();
// Get the typed in ssid.
- const string16& GetSSID() const;
+ const std::string GetSSID() const;
// Get the typed in passphrase.
- const string16& GetPassphrase() const;
+ const std::string GetPassphrase() const;
// Returns true if the textfields are non-empty and we can login.
bool can_login() const { return can_login_; }
@@ -88,7 +88,7 @@ class WifiConfigView : public views::View,
views::Textfield* identity_textfield_;
views::NativeButton* certificate_browse_button_;
scoped_refptr<SelectFileDialog> select_file_dialog_;
- FilePath certificate_path_;
+ std::string certificate_path_;
views::Textfield* passphrase_textfield_;
views::ImageButton* passphrase_visible_button_;
views::Checkbox* autoconnect_checkbox_;

Powered by Google App Engine
This is Rietveld 408576698