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

ash/system/tray/system_tray.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #pragma once
 
 #include "ash/launcher/background_animator.h"
 #include "ash/ash_export.h"
 #include "ash/system/tray/tray_views.h"
 #include "ash/system/user/login_status.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/view.h"
 
 #include <vector>
 
 namespace ash {
 
 class AccessibilityObserver;
 class AudioObserver;
 class BluetoothObserver;
 class BrightnessObserver;
 class CapsLockObserver;
 class ClockObserver;
-class DriveObserver;
 class IMEObserver;
 class NetworkObserver;
 class PowerStatusObserver;
 class UpdateObserver;
 class UserObserver;
 
 class SystemTrayItem;
 
 namespace internal {
 class SystemTrayBackground;
@@ skipping 59 matching lines @@
   }
   BrightnessObserver* brightness_observer() const {
     return brightness_observer_;
   }
   CapsLockObserver* caps_lock_observer() const {
     return caps_lock_observer_;
   }
   ClockObserver* clock_observer() const {
     return clock_observer_;
   }
-  DriveObserver* drive_observer() const {
-    return drive_observer_;
-  }
   IMEObserver* ime_observer() const {
     return ime_observer_;
   }
   NetworkObserver* network_observer() const {
     return network_observer_;
   }
   PowerStatusObserver* power_status_observer() const {
     return power_status_observer_;
   }
   UpdateObserver* update_observer() const {
@@ skipping 35 matching lines @@
   // The container for all the tray views of the items.
   views::View* container_;
 
   // These observers are not owned by the tray.
   AccessibilityObserver* accessibility_observer_;
   AudioObserver* audio_observer_;
   BluetoothObserver* bluetooth_observer_;
   BrightnessObserver* brightness_observer_;
   CapsLockObserver* caps_lock_observer_;
   ClockObserver* clock_observer_;
-  DriveObserver* drive_observer_;
   IMEObserver* ime_observer_;
   NetworkObserver* network_observer_;
   PowerStatusObserver* power_status_observer_;
   UpdateObserver* update_observer_;
   UserObserver* user_observer_;
 
   // The widget hosting the tray.
   views::Widget* widget_;
 
   // The popup widget and the delegate.
   scoped_ptr<internal::SystemTrayBubble> bubble_;
 
   // Owned by the view it's installed on.
   internal::SystemTrayBackground* background_;
 
   // See description agove getter.
   bool should_show_launcher_;
 
   internal::BackgroundAnimator hide_background_animator_;
   internal::BackgroundAnimator hover_background_animator_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_