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

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

Issue 15061006: views: Switch Checkbox over to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: changes per review Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/system/chromeos/settings/tray_settings.cc » ('j') | ui/views/controls/button/button.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/power/tray_power.cc
diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc
index 64f33f2d335a5874ca939b74bc501dee65f6b28d..c52c29aa5b424364cd4060cc26d2c2f30822262f 100644
--- a/ash/system/chromeos/power/tray_power.cc
+++ b/ash/system/chromeos/power/tray_power.cc
@@ -206,7 +206,7 @@ TrayPower::TrayPower(SystemTray* system_tray)
power_tray_(NULL),
notification_view_(NULL),
notification_state_(NOTIFICATION_NONE) {
- PowerManagerHandler::Get()->AddObserver(this);
+ //PowerManagerHandler::Get()->AddObserver(this);
}
TrayPower::~TrayPower() {
@@ -341,11 +341,11 @@ views::View* TrayPower::CreateTrayView(user::LoginStatus status) {
// There may not be enough information when this is created about whether
// there is a battery or not. So always create this, and adjust visibility as
// necessary.
- PowerSupplyStatus power_status =
- PowerManagerHandler::Get()->GetPowerSupplyStatus();
+ // PowerSupplyStatus power_status =
+ // PowerManagerHandler::Get()->GetPowerSupplyStatus();
CHECK(power_tray_ == NULL);
power_tray_ = new tray::PowerTrayView();
- power_tray_->UpdatePowerStatus(power_status, false);
+// power_tray_->UpdatePowerStatus(power_status, false);
return power_tray_;
}
@@ -357,13 +357,13 @@ views::View* TrayPower::CreateDefaultView(user::LoginStatus status) {
views::View* TrayPower::CreateNotificationView(user::LoginStatus status) {
CHECK(notification_view_ == NULL);
- PowerSupplyStatus power_status =
- PowerManagerHandler::Get()->GetPowerSupplyStatus();
- if (!power_status.battery_is_present)
- return NULL;
+// PowerSupplyStatus power_status =
+ // PowerManagerHandler::Get()->GetPowerSupplyStatus();
+// if (!power_status.battery_is_present)
+ // return NULL;
notification_view_ = new PowerNotificationView(this);
- notification_view_->UpdatePowerStatus(power_status);
+ // notification_view_->UpdatePowerStatus(power_status);
return notification_view_;
}
« no previous file with comments | « no previous file | ash/system/chromeos/settings/tray_settings.cc » ('j') | ui/views/controls/button/button.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698