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

Side by Side Diff: ash/system/power/tray_power.h

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: Fix dependency position 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:
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_POWER_TRAY_POWER_H_ 5 #ifndef ASH_SYSTEM_POWER_TRAY_POWER_H_
6 #define ASH_SYSTEM_POWER_TRAY_POWER_H_ 6 #define ASH_SYSTEM_POWER_TRAY_POWER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/system/power/power_status_observer.h" 9 #include "ash/system/power/power_status_observer.h"
10 #include "ash/system/tray/system_tray_item.h" 10 #include "ash/system/tray/system_tray_item.h"
(...skipping 16 matching lines...) Expand all
27 private: 27 private:
28 // Overridden from SystemTrayItem. 28 // Overridden from SystemTrayItem.
29 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 29 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
32 virtual void DestroyTrayView() OVERRIDE; 32 virtual void DestroyTrayView() OVERRIDE;
33 virtual void DestroyDefaultView() OVERRIDE; 33 virtual void DestroyDefaultView() OVERRIDE;
34 virtual void DestroyDetailedView() OVERRIDE; 34 virtual void DestroyDetailedView() OVERRIDE;
35 35
36 // Overridden from PowerStatusObserver. 36 // Overridden from PowerStatusObserver.
37 virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE; 37 virtual void OnPowerStatusChanged(
38 const chromeos::PowerSupplyStatus& status) OVERRIDE;
38 39
39 scoped_ptr<tray::DateView> date_; 40 scoped_ptr<tray::DateView> date_;
40 scoped_ptr<tray::PowerPopupView> power_; 41 scoped_ptr<tray::PowerPopupView> power_;
41 scoped_ptr<tray::PowerTrayView> power_tray_; 42 scoped_ptr<tray::PowerTrayView> power_tray_;
42 43
43 DISALLOW_COPY_AND_ASSIGN(TrayPower); 44 DISALLOW_COPY_AND_ASSIGN(TrayPower);
44 }; 45 };
45 46
46 } // namespace internal 47 } // namespace internal
47 } // namespace ash 48 } // namespace ash
48 49
49 #endif // ASH_SYSTEM_POWER_TRAY_POWER_H_ 50 #endif // ASH_SYSTEM_POWER_TRAY_POWER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698