Pass correct initial/user values when requesting power status

ash/system/tray/system_tray_delegate.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_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 51 matching lines @@
   string16 name;
   string16 short_name;
 };
 
 typedef std::vector<IMEInfo> IMEInfoList;
 
 struct PowerSupplyStatus;
 
 class SystemTrayDelegate {
  public:
+  // TODO(stevenjb): Use PowerManagerClient::UpdateRequestType once moved to
+  // /chromeos directory.

[sadrul, 2012/04/10 00:01:34]

Looks like the relevant code has already moved into chromeos/

[stevenjb, 2012/04/10 18:02:03]

Removed.

+  enum UpdateRequestType {
+    UPDATE_INITIAL,  // Initial update request.
+    UPDATE_USER,     // User initialted update request.
+    UPDATE_POLL      // Update requested by poll signal.
+  };
+
   virtual ~SystemTrayDelegate() {}
 
   // Returns true if system tray should be visible on startup.
   virtual bool GetTrayVisibilityOnStartup() = 0;
 
   // Gets information about the logged in user.
   virtual const std::string GetUserDisplayName() const = 0;
   virtual const std::string GetUserEmail() const = 0;
   virtual const SkBitmap& GetUserImage() const = 0;
   virtual user::LoginStatus GetUserLoginStatus() const = 0;
 
   // Returns whether a system upgrade is available.
   virtual bool SystemShouldUpgrade() const = 0;
 
   // Returns the resource id for the icon to show for the update notification.
   virtual int GetSystemUpdateIconResource() const = 0;
 
   // Returns the desired hour clock type.
   virtual base::HourClockType GetHourClockType() const = 0;
 
   // Gets the current power supply status.
-  virtual PowerSupplyStatus GetPowerSupplyStatus() const = 0;
+  virtual PowerSupplyStatus GetPowerSupplyStatus(
+      UpdateRequestType request_type) const = 0;
 
   // Shows settings.
   virtual void ShowSettings() = 0;
 
   // Shows the settings related to date, timezone etc.
   virtual void ShowDateSettings() = 0;
 
   // Shows the settings related to network.
   virtual void ShowNetworkSettings() = 0;
 
@@ skipping 125 matching lines @@
   // Opens the top up url.
   virtual void ShowCellularTopupURL(const std::string& topup_url) = 0;
 
   // Shows UI for changing proxy settings.
   virtual void ChangeProxySettings() = 0;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_