| 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_USER_TRAY_USER_H_ | 5 #ifndef ASH_SYSTEM_USER_TRAY_USER_H_ |
| 6 #define ASH_SYSTEM_USER_TRAY_USER_H_ | 6 #define ASH_SYSTEM_USER_TRAY_USER_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/session/session_state_delegate.h" | 9 #include "ash/session_state_delegate.h" |
| 10 #include "ash/system/tray/system_tray_item.h" | 10 #include "ash/system/tray/system_tray_item.h" |
| 11 #include "ash/system/user/user_observer.h" | 11 #include "ash/system/user/user_observer.h" |
| 12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 | 13 |
| 14 namespace gfx { | 14 namespace gfx { |
| 15 class Rect; | 15 class Rect; |
| 16 class Size; | 16 class Size; |
| 17 } | 17 } |
| 18 | 18 |
| 19 namespace views { | 19 namespace views { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 views::View* layout_view_; | 92 views::View* layout_view_; |
| 93 tray::RoundedImageView* avatar_; | 93 tray::RoundedImageView* avatar_; |
| 94 views::Label* label_; | 94 views::Label* label_; |
| 95 | 95 |
| 96 DISALLOW_COPY_AND_ASSIGN(TrayUser); | 96 DISALLOW_COPY_AND_ASSIGN(TrayUser); |
| 97 }; | 97 }; |
| 98 | 98 |
| 99 } // namespace ash | 99 } // namespace ash |
| 100 | 100 |
| 101 #endif // ASH_SYSTEM_USER_TRAY_USER_H_ | 101 #endif // ASH_SYSTEM_USER_TRAY_USER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 260783002:
Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed)
Base URL: svn://svn.chromium.org/chrome/