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

Side by Side Diff: ash/common/system/chromeos/power/tray_power.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
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 #ifndef ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
6 #define ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/common/system/chromeos/power/power_status.h"
10 #include "ash/common/system/tray/system_tray_item.h" 11 #include "ash/common/system/tray/system_tray_item.h"
11 #include "ash/system/chromeos/power/power_status.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 13
14 class SkBitmap; 14 class SkBitmap;
15 15
16 namespace gfx { 16 namespace gfx {
17 class Image; 17 class Image;
18 class ImageSkia; 18 class ImageSkia;
19 } 19 }
20 20
21 namespace message_center { 21 namespace message_center {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 // Has the user already dismissed a low-power notification? Should be set 115 // Has the user already dismissed a low-power notification? Should be set
116 // back to false when all power sources are disconnected. 116 // back to false when all power sources are disconnected.
117 bool usb_notification_dismissed_; 117 bool usb_notification_dismissed_;
118 118
119 DISALLOW_COPY_AND_ASSIGN(TrayPower); 119 DISALLOW_COPY_AND_ASSIGN(TrayPower);
120 }; 120 };
121 121
122 } // namespace ash 122 } // namespace ash
123 123
124 #endif // ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_ 124 #endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698