ash uber tray: Add entry for power and date.

chrome/browser/chromeos/dbus/power_manager_client.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 CHROME_BROWSER_CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
 #define CHROME_BROWSER_CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 
+#if defined(USE_AURA)

[Ben Goodger (Google), 2012/03/01 23:58:30]

USE_ASH, here and elsewhere

[sadrul, 2012/03/02 01:59:57]

Done.

+#include "ash/system/power/power_supply_status.h"
+#endif
+
 namespace base {
 class TimeTicks;
 }
 namespace dbus {
 class Bus;
 }
 
 namespace chromeos {
 
+#if defined(USE_AURA)
+typedef struct ash::PowerSupplyStatus PowerSupplyStatus;
+#else
 // This is the local struct that is used in Chrome.
 struct PowerSupplyStatus {
   bool line_power_on;
 
   bool battery_is_present;
   bool battery_is_full;
 
   // Time in seconds until the battery is empty or full, 0 for unknown.
   int64 battery_seconds_to_empty;
   int64 battery_seconds_to_full;
 
   double battery_percentage;
 
   PowerSupplyStatus();
   std::string ToString() const;
 };
+#endif
 
 // Callback used for processing the idle time.  The int64 param is the number of
 // seconds the user has been idle.
 typedef base::Callback<void(int64)> CalculateIdleTimeCallback;
 typedef base::Callback<void(void)> IdleNotificationCallback;
 
 // PowerManagerClient is used to communicate with the power manager.
 class PowerManagerClient {
  public:
   // Interface for observing changes from the power manager.
@@ skipping 103 matching lines @@
   // Create() should be used instead.
   PowerManagerClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PowerManagerClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_DBUS_POWER_MANAGER_CLIENT_H_