Reland r126700: ash uber tray: Add the detailed network popup

ash/system/tray/system_tray_delegate.h

Index: ash/system/tray/system_tray_delegate.h
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index 40e6b077cc8b38b62bd15054fe52abffe45e1820..1bf268b48bdc38cef9127b52d5ec27ff43a70965 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -6,6 +6,10 @@
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #pragma once
 
+#include <string>
+#include <vector>
+
+#include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
@@ -15,10 +19,14 @@ class SkBitmap;
 
 namespace ash {
 
-struct NetworkIconInfo {
+struct ASH_EXPORT NetworkIconInfo {
+  NetworkIconInfo();
+  ~NetworkIconInfo();
+
   SkBitmap image;
   string16 name;
   string16 description;
+  std::string unique_id;
 };
 
 class SystemTrayDelegate {
@@ -46,6 +54,9 @@ class SystemTrayDelegate {
   // Shows the settings related to date, timezone etc.
   virtual void ShowDateSettings() = 0;
 
+  // Show the settings related to network.
+  virtual void ShowNetworkSettings() = 0;
+
   // Shows help.
   virtual void ShowHelp() = 0;
 
@@ -73,7 +84,19 @@ class SystemTrayDelegate {
   // Returns information about the most relevant network. Relevance is
   // determined by the implementor (e.g. a connecting network may be more
   // relevant over a connected network etc.)
-  virtual NetworkIconInfo GetMostRelevantNetworkIcon() = 0;
+  virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) = 0;
+
+  // Returns information about the available networks.
+  virtual void GetAvailableNetworks(std::vector<NetworkIconInfo>* list) = 0;
+
+  // Connects to the network specified by the unique id.
+  virtual void ConnectToNetwork(const std::string& network_id) = 0;
+
+  // Toggles airplane mode.
+  virtual void ToggleAirplaneMode() = 0;
+
+  // Shows UI for changing proxy settings.
+  virtual void ChangeProxySettings() = 0;
 };
 
 }  // namespace ash