ash/common/system/chromeos/power/power_status_view_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_view_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_view.cc ('k') | ash/common/system/chromeos/power/tray_power.h » ('j') | no next file with comments »

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/system/chromeos/power/power_status_view.h"	5 #include "ash/common/system/chromeos/power/power_status_view.h"

6	6

7 #include "ash/system/chromeos/power/power_status.h"	7 #include "ash/common/system/chromeos/power/power_status.h"

8 #include "ash/test/ash_test_base.h"	8 #include "ash/test/ash_test_base.h"

9 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"	9 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"

10 #include "grit/ash_strings.h"	10 #include "grit/ash_strings.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;

(...skipping 118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136 UpdatePowerStatus(prop);	136 UpdatePowerStatus(prop);

137 EXPECT_EQ(original_image.bitmap(), GetBatteryImage().bitmap());	137 EXPECT_EQ(original_image.bitmap(), GetBatteryImage().bitmap());

138	138

139 // Make a big change to the percentage and check that a new image is used.	139 // Make a big change to the percentage and check that a new image is used.

140 prop.set_battery_percent(100.0);	140 prop.set_battery_percent(100.0);

141 UpdatePowerStatus(prop);	141 UpdatePowerStatus(prop);

142 EXPECT_NE(original_image.bitmap(), GetBatteryImage().bitmap());	142 EXPECT_NE(original_image.bitmap(), GetBatteryImage().bitmap());

143 }	143 }

144	144

145 } // namespace ash	145 } // namespace ash

OLD	NEW