Pass correct initial/user values when requesting power status

chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
@@ skipping 220 matching lines @@
 
   virtual int GetSystemUpdateIconResource() const OVERRIDE {
     return UpgradeDetector::GetInstance()->GetIconResourceID(
         UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON);
   }
 
   virtual base::HourClockType GetHourClockType() const OVERRIDE {
     return clock_type_;
   }
 
-  virtual PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE {
+  virtual PowerSupplyStatus GetPowerSupplyStatus(
+      UpdateRequestType request_type) const OVERRIDE {
+    PowerManagerClient::UpdateRequestType type(PowerManagerClient::UPDATE_POLL);
+    switch (request_type) {
+      case UPDATE_INITIAL:
+        type = PowerManagerClient::UPDATE_INITIAL;
+        break;
+      case UPDATE_USER:
+        type = PowerManagerClient::UPDATE_USER;
+        break;
+      case UPDATE_POLL:
+        type = PowerManagerClient::UPDATE_POLL;
+        break;
+    };
     // Explicitly query the power status.
     DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate(
-        PowerManagerClient::UPDATE_USER);
+        type);
     return power_supply_status_;
   }
 
   virtual void ShowSettings() OVERRIDE {
     GetAppropriateBrowser()->OpenOptionsDialog();
   }
 
   virtual void ShowDateSettings() OVERRIDE {
     GetAppropriateBrowser()->ShowDateOptions();
   }
@@ skipping 704 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos