ash uber tray: Add entry for power and date.

ash/shell.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_SHELL_H_
 #define ASH_SHELL_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 25 matching lines @@
 }
 
 namespace ash {
 
 class AcceleratorController;
 class AudioController;
 class BrightnessController;
 class Launcher;
 class NestedDispatcherController;
 class PowerButtonController;
+class PowerStatusController;
 class ShellDelegate;
 class SystemTrayDelegate;
 class SystemTray;
 class VideoDetector;
 class WindowCycleController;
 
 namespace internal {
 class ActivationController;
 class AcceleratorFilter;
 class AppList;
@@ skipping 135 matching lines @@
   }
   WindowCycleController* window_cycle_controller() {
     return window_cycle_controller_.get();
   }
   AudioController* audio_controller() const {
     return audio_controller_;
   }
   BrightnessController* brightness_controller() const {
     return brightness_controller_;
   }
+  PowerStatusController* power_status_controller() const {
+    return power_status_controller_;
+  }
 
   ShellDelegate* delegate() { return delegate_.get(); }
   SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); }
 
   Launcher* launcher() { return launcher_.get(); }
 
   internal::ShelfLayoutManager* shelf() const { return shelf_; }
 
   SystemTray* tray() const { return tray_.get(); }
 
@@ skipping 64 matching lines @@
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::WorkspaceController> workspace_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
   scoped_ptr<internal::TooltipController> tooltip_controller_;
   scoped_ptr<internal::VisibilityController> visibility_controller_;
   scoped_ptr<PowerButtonController> power_button_controller_;
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<internal::FocusCycler> focus_cycler_;
 
-  // The audio and brightness controllers are not owner by the shell.
+  // These controllers are not owner by the shell.

[stevenjb, 2012/03/02 18:18:26]

nit: s/owner/owned/

[sadrul, 2012/03/02 18:52:42]

Done.

   AudioController* audio_controller_;
   BrightnessController* brightness_controller_;
+  PowerStatusController* power_status_controller_;
 
   // An event filter that pre-handles all key events to send them to an IME.
   scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
 
   // An event filter that pre-handles key events while the partial
   // screenshot UI is active.
   scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_;
 
 #if !defined(OS_MACOSX)
   // An event filter that pre-handles global accelerators.
@@ skipping 24 matching lines @@
   // Offset between the corner of the status area and the corner of the screen
   // when in the compact window mode.
   gfx::Size compact_status_area_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_