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

Side by Side 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, 8 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/system/power/power_supply_status.h ('k') | ash/system/tray/system_tray_delegate.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/power/power_supply_status.h" 5 #include "ash/system/power/power_supply_status.h"
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 9
10 namespace ash { 10 namespace ash {
11 11
12 #if !defined(OS_CHROMEOS)
12 PowerSupplyStatus::PowerSupplyStatus() 13 PowerSupplyStatus::PowerSupplyStatus()
13 : line_power_on(false), 14 : line_power_on(false),
14 battery_is_present(false), 15 battery_is_present(false),
15 battery_is_full(false), 16 battery_is_full(false),
16 battery_seconds_to_empty(0), 17 battery_seconds_to_empty(0),
17 battery_seconds_to_full(0), 18 battery_seconds_to_full(0),
18 battery_percentage(0) { 19 battery_percentage(0) {
19 } 20 }
20 21
21 std::string PowerSupplyStatus::ToString() const { 22 std::string PowerSupplyStatus::ToString() const {
(...skipping 11 matching lines...) Expand all
33 "battery_percentage = %f ", 34 "battery_percentage = %f ",
34 battery_percentage); 35 battery_percentage);
35 base::StringAppendF(&result, 36 base::StringAppendF(&result,
36 "battery_seconds_to_empty = %"PRId64" ", 37 "battery_seconds_to_empty = %"PRId64" ",
37 battery_seconds_to_empty); 38 battery_seconds_to_empty);
38 base::StringAppendF(&result, 39 base::StringAppendF(&result,
39 "battery_seconds_to_full = %"PRId64" ", 40 "battery_seconds_to_full = %"PRId64" ",
40 battery_seconds_to_full); 41 battery_seconds_to_full);
41 return result; 42 return result;
42 } 43 }
44 #endif // !defined(OS_CHROMEOS)
43 45
44 } // namespace ash 46 } // namespace ash
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698