| OLD | NEW |
| 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 #include "ash/common/system/chromeos/power/tray_power.h" | 5 #include "ash/common/system/chromeos/power/tray_power.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/accessibility_delegate.h" | 9 #include "ash/common/accessibility_delegate.h" |
| 10 #include "ash/common/ash_switches.h" | 10 #include "ash/common/ash_switches.h" |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 views::View* TrayPower::CreateDefaultView(LoginStatus status) { | 175 views::View* TrayPower::CreateDefaultView(LoginStatus status) { |
| 176 // Make sure icon status is up to date. (Also triggers stub activation). | 176 // Make sure icon status is up to date. (Also triggers stub activation). |
| 177 PowerStatus::Get()->RequestStatusUpdate(); | 177 PowerStatus::Get()->RequestStatusUpdate(); |
| 178 return NULL; | 178 return NULL; |
| 179 } | 179 } |
| 180 | 180 |
| 181 void TrayPower::DestroyTrayView() { | 181 void TrayPower::DestroyTrayView() { |
| 182 power_tray_ = NULL; | 182 power_tray_ = NULL; |
| 183 } | 183 } |
| 184 | 184 |
| 185 void TrayPower::DestroyDefaultView() {} | |
| 186 | |
| 187 void TrayPower::UpdateAfterLoginStatusChange(LoginStatus status) {} | |
| 188 | |
| 189 void TrayPower::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { | |
| 190 SetTrayImageItemBorder(power_tray_, alignment); | |
| 191 } | |
| 192 | |
| 193 void TrayPower::OnPowerStatusChanged() { | 185 void TrayPower::OnPowerStatusChanged() { |
| 194 bool battery_alert = UpdateNotificationState(); | 186 bool battery_alert = UpdateNotificationState(); |
| 195 if (power_tray_) | 187 if (power_tray_) |
| 196 power_tray_->UpdateStatus(battery_alert); | 188 power_tray_->UpdateStatus(battery_alert); |
| 197 | 189 |
| 198 // Factory testing may place the battery into unusual states. | 190 // Factory testing may place the battery into unusual states. |
| 199 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 191 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 200 ash::switches::kAshHideNotificationsForFactory)) | 192 ash::switches::kAshHideNotificationsForFactory)) |
| 201 return; | 193 return; |
| 202 | 194 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 } | 346 } |
| 355 NOTREACHED(); | 347 NOTREACHED(); |
| 356 return false; | 348 return false; |
| 357 } | 349 } |
| 358 | 350 |
| 359 void TrayPower::NotifyUsbNotificationClosedByUser() { | 351 void TrayPower::NotifyUsbNotificationClosedByUser() { |
| 360 usb_notification_dismissed_ = true; | 352 usb_notification_dismissed_ = true; |
| 361 } | 353 } |
| 362 | 354 |
| 363 } // namespace ash | 355 } // namespace ash |
| OLD | NEW |