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

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

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modified CL to provide TrayItems and Tray*Views with parent pointers instead. Created 8 years, 1 month 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
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 7
8 #include "ash/system/tray/system_tray_item.h" 8 #include "ash/system/tray/system_tray_item.h"
9 9
10 namespace views { 10 namespace views {
11 class ImageView; 11 class ImageView;
12 } 12 }
13 13
14 namespace ash { 14 namespace ash {
15
16 class SystemTray;
17
15 namespace internal { 18 namespace internal {
16 19
17 class TrayItemView; 20 class TrayItemView;
18 21
19 class TrayImageItem : public SystemTrayItem { 22 class TrayImageItem : public SystemTrayItem {
20 public: 23 public:
21 explicit TrayImageItem(int resource_id); 24 TrayImageItem(SystemTray* system_tray, int resource_id);
22 virtual ~TrayImageItem(); 25 virtual ~TrayImageItem();
23 26
24 views::View* tray_view(); 27 views::View* tray_view();
25 28
26 // Changes the icon of the tray-view to the specified resource. 29 // Changes the icon of the tray-view to the specified resource.
27 void SetImageFromResourceId(int resource_id); 30 void SetImageFromResourceId(int resource_id);
28 31
29 protected: 32 protected:
30 virtual bool GetInitialVisibility() = 0; 33 virtual bool GetInitialVisibility() = 0;
31 34
(...skipping 12 matching lines...) Expand all
44 int resource_id_; 47 int resource_id_;
45 TrayItemView* tray_view_; 48 TrayItemView* tray_view_;
46 49
47 DISALLOW_COPY_AND_ASSIGN(TrayImageItem); 50 DISALLOW_COPY_AND_ASSIGN(TrayImageItem);
48 }; 51 };
49 52
50 } // namespace internal 53 } // namespace internal
51 } // namespace ash 54 } // namespace ash
52 55
53 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 56 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698