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

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: 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 {
(...skipping 13 matching lines...) Expand all
24 views::View* tray_view(); 24 views::View* tray_view();
25 25
26 // Changes the icon of the tray-view to the specified resource. 26 // Changes the icon of the tray-view to the specified resource.
27 void SetImageFromResourceId(int resource_id); 27 void SetImageFromResourceId(int resource_id);
28 28
29 protected: 29 protected:
30 virtual bool GetInitialVisibility() = 0; 30 virtual bool GetInitialVisibility() = 0;
31 31
32 // Overridden from SystemTrayItem. 32 // Overridden from SystemTrayItem.
33 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 33 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
34 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 34 virtual views::View* CreateDefaultView(user::LoginStatus status,
35 int bubble_width) OVERRIDE;
35 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 36 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
36 virtual void DestroyTrayView() OVERRIDE; 37 virtual void DestroyTrayView() OVERRIDE;
37 virtual void DestroyDefaultView() OVERRIDE; 38 virtual void DestroyDefaultView() OVERRIDE;
38 virtual void DestroyDetailedView() OVERRIDE; 39 virtual void DestroyDetailedView() OVERRIDE;
39 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 40 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
40 virtual void UpdateAfterShelfAlignmentChange( 41 virtual void UpdateAfterShelfAlignmentChange(
41 ShelfAlignment alignment) OVERRIDE; 42 ShelfAlignment alignment) OVERRIDE;
42 43
43 private: 44 private:
44 int resource_id_; 45 int resource_id_;
45 TrayItemView* tray_view_; 46 TrayItemView* tray_view_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(TrayImageItem); 48 DISALLOW_COPY_AND_ASSIGN(TrayImageItem);
48 }; 49 };
49 50
50 } // namespace internal 51 } // namespace internal
51 } // namespace ash 52 } // namespace ash
52 53
53 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 54 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698