Add ash UI for third-party VPNs

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 8487b997f0310cc5e60013aa3c1baf3288a63bff..79fe79aedf2704d884d82477ec6e21190071b1a4 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.h
@@ -10,10 +10,11 @@
 #include "ash/system/chromeos/network/network_detailed_view.h"
 #include "ash/system/tray/view_click_listener.h"
 #include "ash/system/user/login_status.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "ui/chromeos/network/network_list.h"
 #include "ui/chromeos/network/network_list_delegate.h"
+#include "ui/chromeos/network/network_list_view_base.h"

[oshima, 2015/03/10 22:42:06]

forward decl should be enough.

[bartfab (slow), 2015/03/11 11:14:09]

Done.

 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/button.h"
 
@@ -121,7 +122,6 @@ class NetworkStateListDetailedView
   TrayPopupLabelButton* other_wifi_;
   TrayPopupLabelButton* turn_on_wifi_;
   TrayPopupLabelButton* other_mobile_;
-  TrayPopupLabelButton* other_vpn_;
   TrayPopupLabelButton* settings_;
   TrayPopupLabelButton* proxy_settings_;
 
@@ -130,7 +130,7 @@ class NetworkStateListDetailedView
 
   gfx::Image controlled_by_extension_icon_;
 
-  ui::NetworkListView network_list_view_;
+  scoped_ptr<ui::NetworkListViewBase> network_list_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView);
 };