| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "ash/common/system/chromeos/power/power_status_view.h" | 5 #include "ash/system/power/power_status_view.h" | 
| 6 | 6 | 
| 7 #include "ash/common/system/chromeos/power/power_status.h" |  | 
| 8 #include "ash/strings/grit/ash_strings.h" | 7 #include "ash/strings/grit/ash_strings.h" | 
|  | 8 #include "ash/system/power/power_status.h" | 
| 9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" | 
| 10 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" | 10 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" | 
| 11 #include "ui/base/l10n/l10n_util.h" | 11 #include "ui/base/l10n/l10n_util.h" | 
| 12 #include "ui/base/l10n/time_format.h" | 12 #include "ui/base/l10n/time_format.h" | 
| 13 #include "ui/gfx/image/image_skia.h" | 13 #include "ui/gfx/image/image_skia.h" | 
| 14 #include "ui/views/controls/image_view.h" | 14 #include "ui/views/controls/image_view.h" | 
| 15 #include "ui/views/controls/label.h" | 15 #include "ui/views/controls/label.h" | 
| 16 | 16 | 
| 17 using power_manager::PowerSupplyProperties; | 17 using power_manager::PowerSupplyProperties; | 
| 18 | 18 | 
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 110   // on production though. | 110   // on production though. | 
| 111   prop.set_external_power(PowerSupplyProperties::AC); | 111   prop.set_external_power(PowerSupplyProperties::AC); | 
| 112   prop.set_battery_state(PowerSupplyProperties::DISCHARGING); | 112   prop.set_battery_state(PowerSupplyProperties::DISCHARGING); | 
| 113   prop.set_battery_time_to_full_sec(120); | 113   prop.set_battery_time_to_full_sec(120); | 
| 114   UpdatePowerStatus(prop); | 114   UpdatePowerStatus(prop); | 
| 115   EXPECT_TRUE(IsPercentageVisible()); | 115   EXPECT_TRUE(IsPercentageVisible()); | 
| 116   EXPECT_FALSE(IsTimeStatusVisible()); | 116   EXPECT_FALSE(IsTimeStatusVisible()); | 
| 117 } | 117 } | 
| 118 | 118 | 
| 119 }  // namespace ash | 119 }  // namespace ash | 
| OLD | NEW | 
|---|