Revert 134774 because of win aura compile and chromium os browser_test crashes - Created uber tray …

ash/system/tray/system_tray.h

Index: ash/system/tray/system_tray.h
===================================================================
--- ash/system/tray/system_tray.h	(revision 134777)
+++ ash/system/tray/system_tray.h	(working copy)
@@ -26,7 +26,6 @@
 class BrightnessObserver;
 class CapsLockObserver;
 class ClockObserver;
-class DriveObserver;
 class IMEObserver;
 class NetworkObserver;
 class PowerStatusObserver;
@@ -106,9 +105,6 @@
   ClockObserver* clock_observer() const {
     return clock_observer_;
   }
-  DriveObserver* drive_observer() const {
-    return drive_observer_;
-  }
   IMEObserver* ime_observer() const {
     return ime_observer_;
   }
@@ -164,7 +160,6 @@
   BrightnessObserver* brightness_observer_;
   CapsLockObserver* caps_lock_observer_;
   ClockObserver* clock_observer_;
-  DriveObserver* drive_observer_;
   IMEObserver* ime_observer_;
   NetworkObserver* network_observer_;
   PowerStatusObserver* power_status_observer_;
Property changes on: ash/system/tray/system_tray.h
___________________________________________________________________
Deleted: svn:mergeinfo