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

Side by Side Diff: ash/system/tray/tray_image_item.h

Issue 9969068: ash: Animate changes in the uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 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/system_tray_item.h ('k') | ash/system/tray/tray_image_item.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_TRAY_TRAY_IMAGE_ITEM_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
6 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_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 10
11 namespace views { 11 namespace views {
12 class ImageView; 12 class ImageView;
13 } 13 }
14 14
15 namespace ash { 15 namespace ash {
16 namespace internal { 16 namespace internal {
17 17
18 class TrayItemView;
19
18 class TrayImageItem : public SystemTrayItem { 20 class TrayImageItem : public SystemTrayItem {
19 public: 21 public:
20 explicit TrayImageItem(int resource_id); 22 explicit TrayImageItem(int resource_id);
21 virtual ~TrayImageItem(); 23 virtual ~TrayImageItem();
22 24
23 views::ImageView* image_view() { return image_view_.get(); } 25 views::View* tray_view();
24 26
25 protected: 27 protected:
26 virtual bool GetInitialVisibility() = 0; 28 virtual bool GetInitialVisibility() = 0;
27 29
28 // Overridden from SystemTrayItem. 30 // Overridden from SystemTrayItem.
29 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 31 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
30 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 32 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
31 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 33 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
32 virtual void DestroyTrayView() OVERRIDE; 34 virtual void DestroyTrayView() OVERRIDE;
33 virtual void DestroyDefaultView() OVERRIDE; 35 virtual void DestroyDefaultView() OVERRIDE;
34 virtual void DestroyDetailedView() OVERRIDE; 36 virtual void DestroyDetailedView() OVERRIDE;
35 37
36 private: 38 private:
37 int resource_id_; 39 int resource_id_;
38 scoped_ptr<views::ImageView> image_view_; 40 scoped_ptr<TrayItemView> tray_view_;
39 41
40 DISALLOW_COPY_AND_ASSIGN(TrayImageItem); 42 DISALLOW_COPY_AND_ASSIGN(TrayImageItem);
41 }; 43 };
42 44
43 } // namespace internal 45 } // namespace internal
44 } // namespace ash 46 } // namespace ash
45 47
46 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 48 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_item.h ('k') | ash/system/tray/tray_image_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698