Revert 126700 because it broke clang on chromeos.

ash/system/tray/system_tray_delegate.h

Index: ash/system/tray/system_tray_delegate.h
===================================================================
--- ash/system/tray/system_tray_delegate.h	(revision 126705)
+++ ash/system/tray/system_tray_delegate.h	(working copy)
@@ -6,9 +6,6 @@
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include "ash/system/user/login_status.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
@@ -22,7 +19,6 @@
   SkBitmap image;
   string16 name;
   string16 description;
-  std::string unique_id;
 };
 
 class SystemTrayDelegate {
@@ -50,9 +46,6 @@
   // 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;
 
@@ -80,19 +73,7 @@
   // 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(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;
+  virtual NetworkIconInfo GetMostRelevantNetworkIcon() = 0;
 };
 
 }  // namespace ash