| 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 "ui/views/view.h" | 9 #include "ui/views/view.h" |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) { | 51 void SystemTrayItem::PopupDetailedView(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() { | 60 void SystemTrayItem::HideDetailedView(bool animate) { |
| 61 system_tray()->HideDetailedView(this); | 61 system_tray()->HideDetailedView(this, animate); |
| 62 } | 62 } |
| 63 | 63 |
| 64 void SystemTrayItem::ShowNotificationView() { | 64 void SystemTrayItem::ShowNotificationView() { |
| 65 system_tray()->ShowNotificationView(this); | 65 system_tray()->ShowNotificationView(this); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void SystemTrayItem::HideNotificationView() { | 68 void SystemTrayItem::HideNotificationView() { |
| 69 system_tray()->HideNotificationView(this); | 69 system_tray()->HideNotificationView(this); |
| 70 } | 70 } |
| 71 | 71 |
| 72 bool SystemTrayItem::ShouldHideArrow() const { | 72 bool SystemTrayItem::ShouldHideArrow() const { |
| 73 return false; | 73 return false; |
| 74 } | 74 } |
| 75 | 75 |
| 76 bool SystemTrayItem::ShouldShowShelf() const { | 76 bool SystemTrayItem::ShouldShowShelf() const { |
| 77 return true; | 77 return true; |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace ash | 80 } // namespace ash |
| OLD | NEW |