Fixed some logic bugs in the Network Menu DOM UI (7343)

chrome/browser/chromeos/status/network_menu.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 57 matching lines @@
   };
 
   NetworkMenu();
   virtual ~NetworkMenu();
 
   // Retrieves network info for the DOMUI NetworkMenu (NetworkMenuUI).
   // |index| is the index in menu_items_, set when the menu is built.
   bool GetNetworkAt(int index, NetworkInfo* info) const;
 
   // Connect or reconnect to the network at |index|.
-  void ConnectToNetworkAt(int index,
+  // If remember >= 0, set the favorite state of the network.
+  // Returns true if a connect occurred (e.g. menu should be closed).
+  bool ConnectToNetworkAt(int index,
                           const std::string& passphrase,
-                          const std::string& identity) const;
+                          const std::string& ssid,
+                          int remember) const;
 
   // menus::MenuModel implementation.
   virtual bool HasIcons() const  { return true; }
   virtual int GetItemCount() const;
   virtual menus::MenuModel::ItemType GetTypeAt(int index) const;
   virtual int GetCommandIdAt(int index) const { return index; }
   virtual string16 GetLabelAt(int index) const;
   virtual bool IsLabelDynamicAt(int index) const { return true; }
   virtual const gfx::Font* GetLabelFontAt(int index) const;
   virtual bool GetAcceleratorAt(int index,
@@ skipping 71 matching lines @@
   };
   typedef std::vector<MenuItem> MenuItemVector;
 
   // views::ViewMenuDelegate implementation.
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // Called by RunMenu to initialize our list of menu items.
   void InitMenuItems();
 
   // Shows network details in DOM UI options window.
-  void ShowTabbedNetworkSettings(const Network& network);
+  void ShowTabbedNetworkSettings(const Network& network) const;
 
   // Show a NetworkConfigView modal dialog instance.
   // TODO(stevenjb): deprecate this once all of the UI is embedded in the menu.
   void ShowNetworkConfigView(NetworkConfigView* view, bool focus_login) const;
 
+  // Wrappers for the ShowNetworkConfigView / ShowTabbedNetworkSettings.
+  void ShowWifi(const WifiNetwork& wifi, bool focus_login) const;
+  void ShowCellular(const CellularNetwork& cellular, bool focus_login) const;
+  void ShowEthernet(const EthernetNetwork& ethernet) const;
+  void ShowOther() const;
+
   // Set to true if we are currently refreshing the menu.
   bool refreshing_menu_;
 
   // The number of wifi strength images.
   static const int kNumWifiImages;
 
   // Our menu items.
   MenuItemVector menu_items_;
 
   // The network menu.
   scoped_ptr<views::Menu2> network_menu_;
 
   // Holds minimum width or -1 if it wasn't set up.
   int min_width_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenu);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_