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

ash/system/tray/system_tray.cc

Index: ash/system/tray/system_tray.cc
===================================================================
--- ash/system/tray/system_tray.cc	(revision 134777)
+++ ash/system/tray/system_tray.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "ash/system/bluetooth/tray_bluetooth.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/date/tray_date.h"
-#include "ash/system/drive/tray_drive.h"
 #include "ash/system/ime/tray_ime.h"
 #include "ash/system/network/tray_network.h"
 #include "ash/system/power/power_status_observer.h"
@@ -137,10 +136,6 @@
     PreferredSizeChanged();
   }
 
-  virtual void ChildPreferredSizeChanged(View* child) OVERRIDE {
-    PreferredSizeChanged();
-  }
-
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE {
     hover_ = true;
     SchedulePaint();
@@ -610,6 +605,37 @@
 
 }  // namespace internal
 
+// From system_tray_delegate.h
+
+NetworkIconInfo::NetworkIconInfo()
+    : highlight(false),
+      tray_icon_visible(true) {
+}
+
+NetworkIconInfo::~NetworkIconInfo() {
+}
+
+BluetoothDeviceInfo::BluetoothDeviceInfo()
+    : connected(false) {
+}
+
+BluetoothDeviceInfo::~BluetoothDeviceInfo() {
+}
+
+IMEInfo::IMEInfo()
+    : selected(false) {
+}
+
+IMEInfo::~IMEInfo() {
+}
+
+IMEPropertyInfo::IMEPropertyInfo()
+    : selected(false) {
+}
+
+IMEPropertyInfo::~IMEPropertyInfo() {
+}
+
 // SystemTray
 
 SystemTray::SystemTray()
@@ -620,7 +646,6 @@
       brightness_observer_(NULL),
       caps_lock_observer_(NULL),
       clock_observer_(NULL),
-      drive_observer_(NULL),
       ime_observer_(NULL),
       network_observer_(NULL),
       power_status_observer_(NULL),
@@ -671,7 +696,6 @@
   internal::TrayAccessibility* tray_accessibility =
       new internal::TrayAccessibility;
   internal::TrayCapsLock* tray_caps_lock = new internal::TrayCapsLock;
-  internal::TrayDrive* tray_drive = new internal::TrayDrive;
   internal::TrayIME* tray_ime = new internal::TrayIME;
   internal::TrayUpdate* tray_update = new internal::TrayUpdate;
 
@@ -681,7 +705,6 @@
   brightness_observer_ = tray_brightness;
   caps_lock_observer_ = tray_caps_lock;
   clock_observer_ = tray_date;
-  drive_observer_ = tray_drive;
   ime_observer_ = tray_ime;
   network_observer_ = tray_network;
   power_status_observer_ = tray_power;
@@ -693,7 +716,6 @@
   AddTrayItem(tray_power);
   AddTrayItem(tray_network);
   AddTrayItem(tray_bluetooth);
-  AddTrayItem(tray_drive);
   AddTrayItem(tray_ime);
   AddTrayItem(tray_volume);
   AddTrayItem(tray_brightness);
Property changes on: ash/system/tray/system_tray.cc
___________________________________________________________________
Deleted: svn:mergeinfo