1 files changed, 21 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index 3c3137e..9a72a25 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "app/combobox_model.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
@@ -16,6 +17,7 @@
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/native_button.h"
+#include "views/controls/combobox/combobox.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/view.h"
 
@@ -29,11 +31,12 @@ class NetworkConfigView;
 class WifiConfigView : public views::View,
                        public views::Textfield::Controller,
                        public views::ButtonListener,
+                       public views::Combobox::Listener,
                        public SelectFileDialog::Listener {
  public:
-  WifiConfigView(NetworkConfigView* parent, WifiNetwork wifi);
+  WifiConfigView(NetworkConfigView* parent, const WifiNetwork* wifi);
   explicit WifiConfigView(NetworkConfigView* parent);
-  virtual ~WifiConfigView() {}
+  virtual ~WifiConfigView();
 
   // views::Textfield::Controller methods.
   virtual void ContentsChanged(views::Textfield* sender,
@@ -44,6 +47,10 @@ class WifiConfigView : public views::View,
   // views::ButtonListener
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
+  // views::Combobox::Listener
+  virtual void ItemChanged(views::Combobox* combo_box,
+                           int prev_index, int new_index);
+
   // SelectFileDialog::Listener implementation.
   virtual void FileSelected(const FilePath& path, int index, void* params);
 
@@ -69,6 +76,16 @@ class WifiConfigView : public views::View,
   FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, ChangeAutoConnectSaveTest);
   FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, ChangePasswordSaveTest);
 
+  class SecurityComboboxModel : public ComboboxModel {
+   public:
+    SecurityComboboxModel() {}
+    virtual ~SecurityComboboxModel() {}
+    virtual int GetItemCount();
+    virtual string16 GetItemAt(int index);
+   private:
+    DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
+  };
+
   // Initializes UI.
   void Init();
 
@@ -86,13 +103,14 @@ class WifiConfigView : public views::View,
   // contents change.
   bool can_login_;
 
-  WifiNetwork wifi_;
+  scoped_ptr<WifiNetwork> wifi_;
 
   views::Textfield* ssid_textfield_;
   views::Textfield* identity_textfield_;
   views::NativeButton* certificate_browse_button_;
   scoped_refptr<SelectFileDialog> select_file_dialog_;
   std::string certificate_path_;
+  views::Combobox* security_combobox_;
   views::Textfield* passphrase_textfield_;
   views::ImageButton* passphrase_visible_button_;
   views::Checkbox* autoconnect_checkbox_;