ash/common/system/chromeos/power/power_status_unittest.cc - Issue 2072013002: mash: Move tray settings and deps to common.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 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

« ash/common/DEPS ('K') | « ash/common/system/chromeos/power/power_status.cc ('k') | ash/common/system/chromeos/power/power_status_view.h » ('j') | no next file with comments »

OLD	NEW
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/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 "base/message_loop/message_loop.h"	9 #include "base/message_loop/message_loop.h"

10 #include "chromeos/dbus/dbus_thread_manager.h"	10 #include "chromeos/dbus/dbus_thread_manager.h"

11 #include "testing/gtest/include/gtest/gtest.h"	11 #include "testing/gtest/include/gtest/gtest.h"

12 #include "third_party/cros_system_api/dbus/service_constants.h"	12 #include "third_party/cros_system_api/dbus/service_constants.h"

13	13

14 using power_manager::PowerSupplyProperties;	14 using power_manager::PowerSupplyProperties;

15	15

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
187	187

188 // Ditto for 98%, but on USB instead of AC.	188 // Ditto for 98%, but on USB instead of AC.

189 prop.set_external_power(PowerSupplyProperties::USB);	189 prop.set_external_power(PowerSupplyProperties::USB);

190 prop.set_battery_percent(98.0);	190 prop.set_battery_percent(98.0);

191 power_status_->SetProtoForTesting(prop);	191 power_status_->SetProtoForTesting(prop);

192 EXPECT_NE(info_charging_98,	192 EXPECT_NE(info_charging_98,

193 power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT));	193 power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT));

194 }	194 }

195	195

196 } // namespace ash	196 } // namespace ash

OLD	NEW