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

Unified Diff: ash/system/power/tray_power.cc

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix single-letter typo :(. Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/power/tray_power.h ('k') | ash/system/settings/tray_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/power/tray_power.cc
diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc
index 27696e70066e853f39e3eb288d678ea0bc7c31bc..ff1a95f5acd943818f127078a830422221d11219 100644
--- a/ash/system/power/tray_power.cc
+++ b/ash/system/power/tray_power.cc
@@ -100,8 +100,8 @@ class PowerTrayView : public views::ImageView {
class PowerNotificationView : public TrayNotificationView {
public:
- explicit PowerNotificationView(TrayPower* tray)
- : TrayNotificationView(tray, 0),
+ explicit PowerNotificationView(TrayPower* owner)
+ : TrayNotificationView(owner, 0),
battery_icon_index_(-1) {
power_status_view_ =
new PowerStatusView(PowerStatusView::VIEW_NOTIFICATION, true);
@@ -133,8 +133,9 @@ class PowerNotificationView : public TrayNotificationView {
using tray::PowerNotificationView;
-TrayPower::TrayPower()
- : power_tray_(NULL),
+TrayPower::TrayPower(SystemTray* system_tray)
+ : SystemTrayItem(system_tray),
+ power_tray_(NULL),
notification_view_(NULL),
notification_state_(NOTIFICATION_NONE) {
}
« no previous file with comments | « ash/system/power/tray_power.h ('k') | ash/system/settings/tray_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698