ash uber tray: Add entry for power and date.

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/settings/tray_settings.h"
+#include "ash/system/power/power_status_controller.h"
+#include "ash/system/power/tray_power_date.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray_user.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/compact_layout_manager.h"
 #include "ash/wm/compact_status_area_layout_manager.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/panel_window_event_filter.h"
@@ skipping 384 matching lines @@
     tray_.reset(new SystemTray());
     status_widget_->GetContentsView()->AddChildView(tray_.get());
 
     if (delegate_.get())
       tray_delegate_.reset(delegate_->CreateSystemTrayDelegate(tray_.get()));
     if (!tray_delegate_.get())
       tray_delegate_.reset(new DummySystemTrayDelegate());
 
     internal::TrayVolume* tray_volume = new internal::TrayVolume();
     internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
+    internal::TrayPowerDate* tray_power_date = new internal::TrayPowerDate();
     audio_controller_ = tray_volume;
     brightness_controller_ = tray_brightness;
+    power_status_controller_ = tray_power_date;
 
     tray_->AddTrayItem(new internal::TrayUser());
+    tray_->AddTrayItem(tray_power_date);
     tray_->AddTrayItem(tray_volume);
     tray_->AddTrayItem(tray_brightness);
     tray_->AddTrayItem(new internal::TraySettings());
   }
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   launcher_.reset(new Launcher(default_container));
 
   if (window_mode_ == MODE_COMPACT)
@@ skipping 216 matching lines @@
 
   // Create the desktop background image.
   SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
 void Shell::ResetLayoutManager(int container_id) {
   GetContainer(container_id)->SetLayoutManager(NULL);
 }
 
 }  // namespace ash