ash/system/chromeos/power/power_status.cc - Issue 148463011: Merge 247397 "chromeos: Avoid notification for original Spring c..."

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

Unified Diff: ash/system/chromeos/power/power_status.cc

Issue 148463011: Merge 247397 "chromeos: Avoid notification for original Spring c..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1750/src/

Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments

Download patch

Index: ash/system/chromeos/power/power_status.cc

===================================================================

--- ash/system/chromeos/power/power_status.cc (revision 247460)

+++ ash/system/chromeos/power/power_status.cc (working copy)

@@ -189,13 +189,8 @@

}

bool PowerStatus::IsOriginalSpringChargerConnected() const {

- // Use the hard coded enum integer value for

- // PowerSupplyProperties_ExternalPower_ORIGINAL_SPRING_CHARGER

- // in purpose of backport compatibility.

- // TODO(jennyz): change this to use

- // PowerSupplyProperties_ExternalPower_ORIGINAL_SPRING_CHARGER on trunk

- // after the change has been merged.

- return proto_.external_power() == 3;

+ return proto_.external_power() == power_manager::

+ PowerSupplyProperties_ExternalPower_ORIGINAL_SPRING_CHARGER;

}

gfx::ImageSkia PowerStatus::GetBatteryImage(IconSet icon_set) const {

« no previous file with comments | « no previous file | ash/system/chromeos/power/tray_power.cc » ('j') | no next file with comments »