UI for 802.1x connections.

chrome/browser/chromeos/options/wifi_config_view.h

Index: chrome/browser/chromeos/options/wifi_config_view.h
===================================================================
--- chrome/browser/chromeos/options/wifi_config_view.h	(revision 76806)
+++ chrome/browser/chromeos/options/wifi_config_view.h	(working copy)
@@ -34,7 +34,9 @@
                        public views::Combobox::Listener,
                        public SelectFileDialog::Listener {
  public:
+  // Wifi login dialog for wifi network |wifi|
   WifiConfigView(NetworkConfigView* parent, const WifiNetwork* wifi);
+  // Wifi login dialog for "Joining other network..."
   explicit WifiConfigView(NetworkConfigView* parent);
   virtual ~WifiConfigView();
 
@@ -68,11 +70,11 @@
   // Get the typed in passphrase.
   const std::string GetPassphrase() const;
 
-  // Returns true if the textfields are non-empty and we can login.
-  bool can_login() const { return can_login_; }
+  // Returns whether or not we can login.
+  bool CanLogin();
 
  private:
-   class SecurityComboboxModel : public ui::ComboboxModel {
+  class SecurityComboboxModel : public ui::ComboboxModel {
    public:
     SecurityComboboxModel() {}
     virtual ~SecurityComboboxModel() {}
@@ -82,6 +84,28 @@
     DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
   };
 
+  class EAPMethodComboboxModel : public ui::ComboboxModel {
+   public:
+    EAPMethodComboboxModel() {}
+    virtual ~EAPMethodComboboxModel() {}
+    virtual int GetItemCount();
+    virtual string16 GetItemAt(int index);
+   private:
+    DISALLOW_COPY_AND_ASSIGN(EAPMethodComboboxModel);
+  };
+
+  class Phase2AuthComboboxModel : public ui::ComboboxModel {
+   public:
+    explicit Phase2AuthComboboxModel(views::Combobox* eap_method_combobox)
+        : eap_method_combobox_(eap_method_combobox) {}
+    virtual ~Phase2AuthComboboxModel() {}
+    virtual int GetItemCount();
+    virtual string16 GetItemAt(int index);
+   private:
+    views::Combobox* eap_method_combobox_;
+    DISALLOW_COPY_AND_ASSIGN(Phase2AuthComboboxModel);
+  };

[stevenjb, 2011/03/04 01:45:53]

Do these need to be in the header, or can we put them in a namespace in the .cc
file?

[Charlie Lee, 2011/03/04 01:54:14]

You are right. I put them in the .cc file.

On 2011/03/04 01:45:53, Steven Bennetts wrote:

+
   // Initializes UI.
   void Init();
 
@@ -93,14 +117,16 @@
 
   NetworkConfigView* parent_;
 
-  // Whether or not we can log in. This gets recalculated when textfield
-  // contents change.
-  bool can_login_;
+  // Whether or not it is an 802.1x network.
+  bool is_8021x_;
 
   scoped_ptr<WifiNetwork> wifi_;
 
   views::Textfield* ssid_textfield_;
+  views::Combobox* eap_method_combobox_;
+  views::Combobox* phase_2_auth_combobox_;
   views::Textfield* identity_textfield_;
+  views::Textfield* identity_anonymous_textfield_;
   views::NativeButton* certificate_browse_button_;
   scoped_refptr<SelectFileDialog> select_file_dialog_;
   std::string certificate_path_;