| 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/tray/system_tray_item.h" | 5 #include "ash/common/system/tray/system_tray_item.h" |
| 6 | 6 |
| 7 #include "ash/common/system/tray/system_tray.h" | 7 #include "ash/common/system/tray/system_tray.h" |
| 8 #include "ash/common/system/tray/system_tray_delegate.h" | 8 #include "ash/common/system/tray/system_tray_delegate.h" |
| 9 #include "ash/common/system/tray/tray_constants.h" | 9 #include "ash/common/system/tray/tray_constants.h" |
| 10 #include "base/timer/timer.h" | 10 #include "base/timer/timer.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 base::TimeDelta::FromMilliseconds(kTrayDetailedViewTransitionDelayMs), | 41 base::TimeDelta::FromMilliseconds(kTrayDetailedViewTransitionDelayMs), |
| 42 base::Bind(&SystemTray::ShowDetailedView, base::Unretained(system_tray()), | 42 base::Bind(&SystemTray::ShowDetailedView, base::Unretained(system_tray()), |
| 43 this, 0, true, BUBBLE_USE_EXISTING)); | 43 this, 0, true, BUBBLE_USE_EXISTING)); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void SystemTrayItem::UpdateAfterLoginStatusChange(LoginStatus status) {} | 46 void SystemTrayItem::UpdateAfterLoginStatusChange(LoginStatus status) {} |
| 47 | 47 |
| 48 void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { | 48 void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { |
| 49 } | 49 } |
| 50 | 50 |
| 51 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) { | 51 void SystemTrayItem::ShowDetailedView(int for_seconds, bool activate) { |
| 52 system_tray()->ShowDetailedView(this, for_seconds, activate, | 52 system_tray()->ShowDetailedView(this, for_seconds, activate, |
| 53 BUBBLE_CREATE_NEW); | 53 BUBBLE_CREATE_NEW); |
| 54 } | 54 } |
| 55 | 55 |
| 56 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) { | 56 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) { |
| 57 system_tray()->SetDetailedViewCloseDelay(for_seconds); | 57 system_tray()->SetDetailedViewCloseDelay(for_seconds); |
| 58 } | 58 } |
| 59 | 59 |
| 60 void SystemTrayItem::HideDetailedView(bool animate) { | 60 void SystemTrayItem::HideDetailedView(bool animate) { |
| 61 system_tray()->HideDetailedView(this, animate); | 61 system_tray()->HideDetailedView(this, animate); |
| 62 } | 62 } |
| 63 | 63 |
| 64 bool SystemTrayItem::ShouldShowShelf() const { | 64 bool SystemTrayItem::ShouldShowShelf() const { |
| 65 return true; | 65 return true; |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace ash | 68 } // namespace ash |
| OLD | NEW |