Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: ash/common/system/chromeos/power/power_status_unittest.cc

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into animate_shelf_chip_backgrounds Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/common/shelf/wm_shelf_observer.h ('k') | ash/common/system/status_area_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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.h" 5 #include "ash/common/system/chromeos/power/power_status.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/test/material_design_controller_test_api.h" 10 #include "ash/common/test/material_design_controller_test_api.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/cros_system_api/dbus/service_constants.h" 14 #include "third_party/cros_system_api/dbus/service_constants.h"
15 15
16 using power_manager::PowerSupplyProperties; 16 using power_manager::PowerSupplyProperties;
17 17
18 namespace ash { 18 namespace ash {
19 namespace { 19 namespace {
20 20
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 11, 345 11,
346 power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level); 346 power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
347 prop.set_battery_percent(100.0); 347 prop.set_battery_percent(100.0);
348 power_status_->SetProtoForTesting(prop); 348 power_status_->SetProtoForTesting(prop);
349 EXPECT_EQ( 349 EXPECT_EQ(
350 12, 350 12,
351 power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level); 351 power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
352 } 352 }
353 353
354 } // namespace ash 354 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/wm_shelf_observer.h ('k') | ash/common/system/status_area_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698