ash: Clean up some uber-tray related code.

Rename the various 'Controller's to 'Observer's, because that makes more sense,
and move these observers from Shell into SystemTray.

BUG=110130
TEST=none

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

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

1 files changed, 0 insertions, 32 deletions

diff --git a/ash/shell.h b/ash/shell.h
index bb0998a..8a0f615 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -40,20 +40,14 @@ class Widget;
 namespace ash {
 
 class AcceleratorController;
-class AudioController;
-class BrightnessController;
-class DateFormatObserver;
 class Launcher;
 class NestedDispatcherController;
-class NetworkController;
 class PowerButtonController;
-class PowerStatusController;
 class ScreenAsh;
 class ShellDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class SystemTray;
-class UpdateController;
 class VideoDetector;
 class WindowCycleController;
 
@@ -194,24 +188,6 @@ class ASH_EXPORT Shell {
   internal::FocusCycler* focus_cycler() {
     return focus_cycler_.get();
   }
-  AudioController* audio_controller() const {
-    return audio_controller_;
-  }
-  BrightnessController* brightness_controller() const {
-    return brightness_controller_;
-  }
-  DateFormatObserver* date_format_observer() const {
-    return date_format_observer_;
-  }
-  NetworkController* network_controller() const {
-    return network_controller_;
-  }
-  PowerStatusController* power_status_controller() const {
-    return power_status_controller_;
-  }
-  UpdateController* update_controller() const {
-    return update_controller_;
-  }
 
   ShellDelegate* delegate() { return delegate_.get(); }
   SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); }
@@ -292,14 +268,6 @@ class ASH_EXPORT Shell {
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<internal::FocusCycler> focus_cycler_;
 
-  // These controllers are not owned by the shell.
-  AudioController* audio_controller_;
-  BrightnessController* brightness_controller_;
-  DateFormatObserver* date_format_observer_;
-  NetworkController* network_controller_;
-  PowerStatusController* power_status_controller_;
-  UpdateController* update_controller_;
-
   // An event filter that pre-handles all key events to send them to an IME.
   scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;