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

Side by Side Diff: ash/common/system/chromeos/power/power_status_view.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_POWER_STATUS_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
6 #define ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/chromeos/power/power_status.h" 9 #include "ash/common/system/chromeos/power/power_status.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "ui/views/view.h" 11 #include "ui/views/view.h"
12 12
13 namespace views { 13 namespace views {
14 class ImageView; 14 class ImageView;
15 class Label; 15 class Label;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 19
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 // Information about the image last used to update |icon_|. Cached to avoid 54 // Information about the image last used to update |icon_|. Cached to avoid
55 // unnecessary updates (http://crbug.com/589348). 55 // unnecessary updates (http://crbug.com/589348).
56 PowerStatus::BatteryImageInfo previous_battery_image_info_; 56 PowerStatus::BatteryImageInfo previous_battery_image_info_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(PowerStatusView); 58 DISALLOW_COPY_AND_ASSIGN(PowerStatusView);
59 }; 59 };
60 60
61 } // namespace ash 61 } // namespace ash
62 62
63 #endif // ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_ 63 #endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698