Pass correct initial/user values when requesting power status

ash/system/power/tray_power.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/system/power/tray_power.h"
 
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 146 matching lines @@
 }
 
 TrayPower::~TrayPower() {
 }
 
 views::View* TrayPower::CreateTrayView(user::LoginStatus status) {
   // There may not be enough information when this is created about whether
   // there is a battery or not. So always create this, and adjust visibility as
   // necessary.
   PowerSupplyStatus power_status =
-      ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
+      ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus(
+          SystemTrayDelegate::UPDATE_INITIAL);
   power_tray_.reset(new tray::PowerTrayView());
   power_tray_->UpdatePowerStatus(power_status);
   return power_tray_.get();
 }
 
 views::View* TrayPower::CreateDefaultView(user::LoginStatus status) {
   date_.reset(new tray::DateView(tray::DateView::DATE));
   if (status != user::LOGGED_IN_NONE && status != user::LOGGED_IN_LOCKED)
     date_->SetActionable(true);
 
   views::View* container = new views::View;
   views::BoxLayout* layout = new views::BoxLayout(views::BoxLayout::kHorizontal,
       kTrayPopupPaddingHorizontal, 10, 0);
   layout->set_spread_blank_space(true);
   container->SetLayoutManager(layout);
   container->set_background(views::Background::CreateSolidBackground(
       SkColorSetRGB(0xf1, 0xf1, 0xf1)));
   container->AddChildView(date_.get());
 
   PowerSupplyStatus power_status =
-      ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
+      ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus(
+          SystemTrayDelegate::UPDATE_USER);

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

It probably makes sense to remove the call to RequestStatusUpdate in
GetPowerSupplyStatus, and have an explicit
tray_delegate()->RequestPowerStatusUpdate(void), which will make the call to
RequestStatusUpdate. That way, ash doesn't need to know about the update-type.

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

That makes sense. Done.

   if (power_status.battery_is_present) {
     power_.reset(new tray::PowerPopupView());
     power_->UpdatePowerStatus(power_status);
     container->AddChildView(power_.get());
   }
   return container;
 }
 
 views::View* TrayPower::CreateDetailedView(user::LoginStatus status) {
   return NULL;
@@ skipping 13 matching lines @@
 
 void TrayPower::OnPowerStatusChanged(const PowerSupplyStatus& status) {
   if (power_tray_.get())
     power_tray_->UpdatePowerStatus(status);
   if (power_.get())
     power_->UpdatePowerStatus(status);
 }
 
 }  // namespace internal
 }  // namespace ash