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

2 files changed, 8 insertions, 8 deletions

diff --git a/ash/system/brightness/brightness_controller.h b/ash/system/brightness/brightness_observer.h
index 51d0d46..0d2c532 100644
--- a/ash/system/brightness/brightness_controller.h
+++ b/ash/system/brightness/brightness_observer.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_BRIGHTNESS_BRIGHTNESS_CONTROLLER_H_
-#define ASH_SYSTEM_BRIGHTNESS_BRIGHTNESS_CONTROLLER_H_
+#ifndef ASH_SYSTEM_BRIGHTNESS_BRIGHTNESS_OBSERVER_H_
+#define ASH_SYSTEM_BRIGHTNESS_BRIGHTNESS_OBSERVER_H_
 
 #include "ash/ash_export.h"
 
 namespace ash {
 
-class ASH_EXPORT BrightnessController {
+class ASH_EXPORT BrightnessObserver {
  public:
-  virtual ~BrightnessController() {}
+  virtual ~BrightnessObserver() {}
 
   virtual void OnBrightnessChanged(float percent, bool user_initiated) = 0;
 };
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_BRIGHTNESS_BRIGHTNESS_CONTROLLER_H_
+#endif  // ASH_SYSTEM_BRIGHTNESS_BRIGHTNESS_OBSERVER_H_
diff --git a/ash/system/brightness/tray_brightness.h b/ash/system/brightness/tray_brightness.h
index ed0f205..b1f2f5d 100644
--- a/ash/system/brightness/tray_brightness.h
+++ b/ash/system/brightness/tray_brightness.h
@@ -6,7 +6,7 @@
 #define ASH_SYSTEM_BRIGHTNESS_TRAY_BRIGHTNESS_H_
 #pragma once
 
-#include "ash/system/brightness/brightness_controller.h"
+#include "ash/system/brightness/brightness_observer.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "base/compiler_specific.h"
 
@@ -18,7 +18,7 @@ class BrightnessView;
 }
 
 class TrayBrightness : public SystemTrayItem,
-                       public BrightnessController {
+                       public BrightnessObserver {
  public:
   TrayBrightness();
   virtual ~TrayBrightness();
@@ -32,7 +32,7 @@ class TrayBrightness : public SystemTrayItem,
   virtual void DestroyDefaultView() OVERRIDE;
   virtual void DestroyDetailedView() OVERRIDE;
 
-  // Overridden from BrightnessController.
+  // Overridden from BrightnessObserver.
   virtual void OnBrightnessChanged(float percent,
                                    bool user_initiated) OVERRIDE;