ash/system/power/power_supply_status.cc - Issue 9837075: Move power_supply_status.* from src/ash to src/chromeos

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/power/power_supply_status.cc

Issue 9837075: Move power_supply_status.* from src/ash to src/chromeos (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: rebase Created 8 years, 9 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:

Index: ash/system/power/power_supply_status.cc

diff --git a/ash/system/power/power_supply_status.cc b/ash/system/power/power_supply_status.cc

index d1ad5dc9a06f4147d24b503a4e36dafa15974a24..79cfa8610da8e1692e5defadaee0c88a2f6c0221 100644

--- a/ash/system/power/power_supply_status.cc

+++ b/ash/system/power/power_supply_status.cc

@@ -9,6 +9,7 @@

namespace ash {

+#if !defined(OS_CHROMEOS)

PowerSupplyStatus::PowerSupplyStatus()

: line_power_on(false),

battery_is_present(false),

@@ -40,5 +41,6 @@ std::string PowerSupplyStatus::ToString() const {

battery_seconds_to_full);

return result;

}

+#endif // !defined(OS_CHROMEOS)

} // namespace ash

« no previous file with comments | « ash/system/power/power_supply_status.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »