Convert TrayVPN to use new NetworkState code

ash/system/chromeos/network/network_state_list_detailed_view.h

Index: ash/system/chromeos/network/network_state_list_detailed_view.h
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.h b/ash/system/chromeos/network/network_state_list_detailed_view.h
index 4c8772339ab45fe146d41fda76d995224960bcda..031ba76e42b9259d8d67a8b8c4d20fae05eebbfb 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.h
@@ -26,10 +26,12 @@ class BubbleDelegateView;
 }
 
 namespace ash {
+
+class SystemTrayItem;
+
 namespace internal {
 
 class HoverHighlightView;
-class TrayNetwork;
 
 namespace tray {
 
@@ -40,7 +42,13 @@ class NetworkStateListDetailedView : public NetworkDetailedView,
                                      public ViewClickListener,
                                      public network_icon::AnimationObserver {
  public:
-  NetworkStateListDetailedView(TrayNetwork* tray_network,
+  enum ListType {
+    LIST_TYPE_NETWORK,
+    LIST_TYPE_VPN
+  };
+
+  NetworkStateListDetailedView(SystemTrayItem* owner,
+                               ListType list_type,
                                user::LoginStatus login);
   virtual ~NetworkStateListDetailedView();
 
@@ -77,7 +85,7 @@ class NetworkStateListDetailedView : public NetworkDetailedView,
   void UpdateHeaderButtons();
 
   void UpdateNetworks(const NetworkStateList& networks);
-  void UpdateNetworkListEntries();
+  void UpdateNetworkList();

[stevenjb, 2013/03/02 03:14:45]

There's already a UpdateNetworkListEntries, oops. This is a better name anyway.

   bool CreateOrUpdateInfoLabel(
       int index, const string16& text, views::Label** label);
   bool UpdateNetworkChild(int index, const NetworkInfo* info);
@@ -95,8 +103,11 @@ class NetworkStateListDetailedView : public NetworkDetailedView,
   bool ResetInfoBubble();
   views::View* CreateNetworkInfoView();
 
-  // Typed pointer to the owning tray item.
-  TrayNetwork* tray_network_;
+  // Handle click (connect) action
+  void ConnectToNetwork(const std::string& service_path);
+
+  // Type of list (all networks or vpn)
+  ListType list_type_;
 
   // Track login state.
   user::LoginStatus login_;
@@ -124,6 +135,7 @@ class NetworkStateListDetailedView : public NetworkDetailedView,
   TrayPopupLabelButton* other_wifi_;
   TrayPopupLabelButton* turn_on_wifi_;
   TrayPopupLabelButton* other_mobile_;
+  TrayPopupLabelButton* other_vpn_;
   TrayPopupLabelButton* settings_;
   TrayPopupLabelButton* proxy_settings_;
   views::Label* scanning_view_;