| 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/system/tray/system_tray_item.h" |
| 6 | 6 |
| 7 #include "ash/common/system/tray/system_tray.h" | 7 #include "ash/system/tray/system_tray.h" |
| 8 #include "ash/common/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
| 9 #include "ash/common/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
| 10 #include "base/timer/timer.h" | 10 #include "base/timer/timer.h" |
| 11 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 | 14 |
| 15 SystemTrayItem::SystemTrayItem(SystemTray* system_tray, UmaType uma_type) | 15 SystemTrayItem::SystemTrayItem(SystemTray* system_tray, UmaType uma_type) |
| 16 : system_tray_(system_tray), uma_type_(uma_type), restore_focus_(false) {} | 16 : system_tray_(system_tray), uma_type_(uma_type), restore_focus_(false) {} |
| 17 | 17 |
| 18 SystemTrayItem::~SystemTrayItem() {} | 18 SystemTrayItem::~SystemTrayItem() {} |
| 19 | 19 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |