Revert 127748 because it broke tests compile.

---
ash: Add an entry for IME in the tray.

BUG=118862
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9751005

TBR=sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9766003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127750 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 21 deletions

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index e07965b..e345848 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -382,7 +382,6 @@ SystemTray::SystemTray()
       brightness_observer_(NULL),
       caps_lock_observer_(NULL),
       clock_observer_(NULL),
-      ime_observer_(NULL),
       network_observer_(NULL),
       power_status_observer_(NULL),
       update_observer_(NULL),
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 526bc32..f06062d 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -22,7 +22,6 @@ class AudioObserver;
 class BrightnessObserver;
 class CapsLockObserver;
 class ClockObserver;
-class IMEObserver;
 class NetworkObserver;
 class PowerStatusObserver;
 class UpdateObserver;
@@ -75,9 +74,6 @@ class ASH_EXPORT SystemTray : public views::View,
   ClockObserver* clock_observer() const {
     return clock_observer_;
   }
-  IMEObserver* ime_observer() const {
-    return ime_observer_;
-  }
   NetworkObserver* network_observer() const {
     return network_observer_;
   }
@@ -118,7 +114,6 @@ class ASH_EXPORT SystemTray : public views::View,
   BrightnessObserver* brightness_observer_;
   CapsLockObserver* caps_lock_observer_;
   ClockObserver* clock_observer_;
-  IMEObserver* ime_observer_;
   NetworkObserver* network_observer_;
   PowerStatusObserver* power_status_observer_;
   UpdateObserver* update_observer_;
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index 8c0446f..45ba40d 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -29,18 +29,6 @@ struct ASH_EXPORT NetworkIconInfo {
   std::string service_path;
 };
 
-struct ASH_EXPORT IMEInfo {
-  IMEInfo() : selected(false) {}
-  ~IMEInfo() {}
-
-  bool selected;
-  std::string id;
-  string16 name;
-  string16 short_name;
-};
-
-typedef std::vector<IMEInfo> IMEInfoList;
-
 struct PowerSupplyStatus;
 
 class SystemTrayDelegate {
@@ -104,9 +92,6 @@ class SystemTrayDelegate {
   // Attempts to lock the screen.
   virtual void RequestLockScreen() = 0;
 
-  // Returns a list of availble IMEs.
-  virtual IMEInfoList GetAvailableIMEList() = 0;
-
   // 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.)