Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: ash/common/system/user/tray_user.h

Issue 2125373002: mash: Migrate ash/system/user to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_COMMON_SYSTEM_USER_TRAY_USER_H_
6 #define ASH_SYSTEM_USER_TRAY_USER_H_ 6 #define ASH_COMMON_SYSTEM_USER_TRAY_USER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/session/session_types.h" 9 #include "ash/common/session/session_types.h"
10 #include "ash/common/system/tray/system_tray_item.h" 10 #include "ash/common/system/tray/system_tray_item.h"
11 #include "ash/common/system/user/user_observer.h" 11 #include "ash/common/system/user/user_observer.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 13
14 namespace gfx { 14 namespace gfx {
15 class Rect; 15 class Rect;
16 class Size; 16 class Size;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // View that contains label and/or avatar. 86 // View that contains label and/or avatar.
87 views::View* layout_view_; 87 views::View* layout_view_;
88 tray::RoundedImageView* avatar_; 88 tray::RoundedImageView* avatar_;
89 views::Label* label_; 89 views::Label* label_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(TrayUser); 91 DISALLOW_COPY_AND_ASSIGN(TrayUser);
92 }; 92 };
93 93
94 } // namespace ash 94 } // namespace ash
95 95
96 #endif // ASH_SYSTEM_USER_TRAY_USER_H_ 96 #endif // ASH_COMMON_SYSTEM_USER_TRAY_USER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698