ash/common/system/chromeos/power/power_status.h - 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.h

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

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 #ifndef ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_	5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_

6 #define ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_	6 #define ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

11 #include "ash/ash_export.h"	11 #include "ash/ash_export.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "base/observer_list.h"	13 #include "base/observer_list.h"

14 #include "base/strings/string16.h"	14 #include "base/strings/string16.h"

15 #include "base/time/time.h"	15 #include "base/time/time.h"

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

(...skipping 196 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
213 base::ObserverList<Observer> observers_;	213 base::ObserverList<Observer> observers_;

214	214

215 // Current state.	215 // Current state.

216 power_manager::PowerSupplyProperties proto_;	216 power_manager::PowerSupplyProperties proto_;

217	217

218 DISALLOW_COPY_AND_ASSIGN(PowerStatus);	218 DISALLOW_COPY_AND_ASSIGN(PowerStatus);

219 };	219 };

220	220

221 } // namespace ash	221 } // namespace ash

222	222

223 #endif // ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_	223 #endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_

OLD	NEW

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