| 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 |
| 11 namespace ash { | 11 namespace ash { |
| 12 | 12 |
| 13 SystemTrayItem::SystemTrayItem(SystemTray* system_tray) | 13 SystemTrayItem::SystemTrayItem(SystemTray* system_tray, UmaType uma_type) |
| 14 : system_tray_(system_tray), restore_focus_(false) {} | 14 : system_tray_(system_tray), uma_type_(uma_type), restore_focus_(false) {} |
| 15 | 15 |
| 16 SystemTrayItem::~SystemTrayItem() {} | 16 SystemTrayItem::~SystemTrayItem() {} |
| 17 | 17 |
| 18 views::View* SystemTrayItem::CreateTrayView(LoginStatus status) { | 18 views::View* SystemTrayItem::CreateTrayView(LoginStatus status) { |
| 19 return NULL; | 19 return NULL; |
| 20 } | 20 } |
| 21 | 21 |
| 22 views::View* SystemTrayItem::CreateDefaultView(LoginStatus status) { | 22 views::View* SystemTrayItem::CreateDefaultView(LoginStatus status) { |
| 23 return NULL; | 23 return NULL; |
| 24 } | 24 } |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |