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

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

Issue 10269017: Remove scoped_ptr for system tray views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray_update.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_SYSTEM_USER_TRAY_USER_H_
6 #define ASH_SYSTEM_USER_TRAY_USER_H_ 6 #define ASH_SYSTEM_USER_TRAY_USER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "ash/system/user/user_observer.h" 10 #include "ash/system/user/user_observer.h"
(...skipping 22 matching lines...) Expand all
33 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 33 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
34 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 34 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
35 virtual void DestroyTrayView() OVERRIDE; 35 virtual void DestroyTrayView() OVERRIDE;
36 virtual void DestroyDefaultView() OVERRIDE; 36 virtual void DestroyDefaultView() OVERRIDE;
37 virtual void DestroyDetailedView() OVERRIDE; 37 virtual void DestroyDetailedView() OVERRIDE;
38 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 38 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
39 39
40 // Overridden from UserObserver. 40 // Overridden from UserObserver.
41 virtual void OnUserUpdate() OVERRIDE; 41 virtual void OnUserUpdate() OVERRIDE;
42 42
43 scoped_ptr<tray::UserView> user_; 43 tray::UserView* user_;
44 scoped_ptr<tray::RoundedImageView> avatar_; 44 tray::RoundedImageView* avatar_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(TrayUser); 46 DISALLOW_COPY_AND_ASSIGN(TrayUser);
47 }; 47 };
48 48
49 } // namespace internal 49 } // namespace internal
50 } // namespace ash 50 } // namespace ash
51 51
52 #endif // ASH_SYSTEM_USER_TRAY_USER_H_ 52 #endif // ASH_SYSTEM_USER_TRAY_USER_H_
OLDNEW
« no previous file with comments | « ash/system/tray_update.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698