| 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 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ |
| 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/common/login_status.h" |
| 9 #include "ash/common/shelf/shelf_types.h" | 10 #include "ash/common/shelf/shelf_types.h" |
| 10 #include "ash/system/user/login_status.h" | |
| 11 #include "base/compiler_specific.h" | |
| 12 #include "base/macros.h" | 11 #include "base/macros.h" |
| 13 | 12 |
| 14 namespace views { | 13 namespace views { |
| 15 class View; | 14 class View; |
| 16 } | 15 } |
| 17 | 16 |
| 18 namespace ash { | 17 namespace ash { |
| 19 class SystemTray; | 18 class SystemTray; |
| 20 class TrayItemView; | 19 class TrayItemView; |
| 21 | 20 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 110 |
| 112 private: | 111 private: |
| 113 SystemTray* system_tray_; | 112 SystemTray* system_tray_; |
| 114 bool restore_focus_; | 113 bool restore_focus_; |
| 115 | 114 |
| 116 DISALLOW_COPY_AND_ASSIGN(SystemTrayItem); | 115 DISALLOW_COPY_AND_ASSIGN(SystemTrayItem); |
| 117 }; | 116 }; |
| 118 | 117 |
| 119 } // namespace ash | 118 } // namespace ash |
| 120 | 119 |
| 121 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ | 120 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_ITEM_H_ |
| OLD | NEW |