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

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.h

Issue 1692005: 2nd attempt to land http://codereview.chromium.org/1676002 for njw... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 8 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
===================================================================
--- chrome/browser/chromeos/options/wifi_config_view.h (revision 45218)
+++ chrome/browser/chromeos/options/wifi_config_view.h (working copy)
@@ -7,9 +7,13 @@
#include <string>
+#include "base/file_path.h"
#include "base/string16.h"
#include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/shell_dialogs.h"
#include "views/controls/button/button.h"
+#include "views/controls/button/image_button.h"
+#include "views/controls/button/native_button.h"
#include "views/controls/textfield/textfield.h"
#include "views/view.h"
@@ -20,7 +24,8 @@
// A dialog box for showing a password textfield.
class WifiConfigView : public views::View,
public views::Textfield::Controller,
- public views::ButtonListener {
+ public views::ButtonListener,
+ public SelectFileDialog::Listener {
public:
WifiConfigView(NetworkConfigView* parent, WifiNetwork wifi);
explicit WifiConfigView(NetworkConfigView* parent);
@@ -37,6 +42,11 @@
// views::ButtonListener
virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+ // SelectFileDialog::Listener implementation.
+ virtual void FileSelected(const FilePath& path, int index, void* params);
+
+ virtual bool Accept();
+
// Get the typed in ssid.
const string16& GetSSID() const;
// Get the typed in passphrase.
@@ -52,6 +62,8 @@
// Initializes UI.
void Init();
+ void UpdateCanLogin();
+
NetworkConfigView* parent_;
bool other_network_;
@@ -63,7 +75,12 @@
WifiNetwork wifi_;
views::Textfield* ssid_textfield_;
+ views::Textfield* identity_textfield_;
+ views::NativeButton* certificate_browse_button_;
+ scoped_refptr<SelectFileDialog> select_file_dialog_;
+ FilePath certificate_path_;
views::Textfield* passphrase_textfield_;
+ views::ImageButton* passphrase_visible_button_;
DISALLOW_COPY_AND_ASSIGN(WifiConfigView);
};
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698