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

Side by Side Diff: ash/system/ime/tray_ime.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_IME_TRAY_IME_H_ 5 #ifndef ASH_SYSTEM_IME_TRAY_IME_H_
6 #define ASH_SYSTEM_IME_TRAY_IME_H_ 6 #define ASH_SYSTEM_IME_TRAY_IME_H_
7 7
8 #include "ash/system/ime/ime_observer.h" 8 #include "ash/system/ime/ime_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 10
(...skipping 19 matching lines...) Expand all
30 public IMEObserver { 30 public IMEObserver {
31 public: 31 public:
32 TrayIME(); 32 TrayIME();
33 virtual ~TrayIME(); 33 virtual ~TrayIME();
34 34
35 private: 35 private:
36 void UpdateTrayLabel(const IMEInfo& info, size_t count); 36 void UpdateTrayLabel(const IMEInfo& info, size_t count);
37 37
38 // Overridden from SystemTrayItem. 38 // Overridden from SystemTrayItem.
39 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 39 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
40 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 40 virtual views::View* CreateDefaultView(user::LoginStatus status,
41 int bubble_width) OVERRIDE;
41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 42 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
42 virtual views::View* CreateNotificationView( 43 virtual views::View* CreateNotificationView(
43 user::LoginStatus status) OVERRIDE; 44 user::LoginStatus status) OVERRIDE;
44 virtual void DestroyTrayView() OVERRIDE; 45 virtual void DestroyTrayView() OVERRIDE;
45 virtual void DestroyDefaultView() OVERRIDE; 46 virtual void DestroyDefaultView() OVERRIDE;
46 virtual void DestroyDetailedView() OVERRIDE; 47 virtual void DestroyDetailedView() OVERRIDE;
47 virtual void DestroyNotificationView() OVERRIDE; 48 virtual void DestroyNotificationView() OVERRIDE;
48 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 49 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
49 virtual void UpdateAfterShelfAlignmentChange( 50 virtual void UpdateAfterShelfAlignmentChange(
50 ShelfAlignment alignment) OVERRIDE; 51 ShelfAlignment alignment) OVERRIDE;
51 52
52 // Overridden from IMEObserver. 53 // Overridden from IMEObserver.
53 virtual void OnIMERefresh(bool show_message) OVERRIDE; 54 virtual void OnIMERefresh(bool show_message) OVERRIDE;
54 55
55 TrayItemView* tray_label_; 56 TrayItemView* tray_label_;
56 tray::IMEDefaultView* default_; 57 tray::IMEDefaultView* default_;
57 tray::IMEDetailedView* detailed_; 58 tray::IMEDetailedView* detailed_;
58 tray::IMENotificationView* notification_; 59 tray::IMENotificationView* notification_;
59 60
60 bool message_shown_; 61 bool message_shown_;
61 62
62 DISALLOW_COPY_AND_ASSIGN(TrayIME); 63 DISALLOW_COPY_AND_ASSIGN(TrayIME);
63 }; 64 };
64 65
65 } // namespace internal 66 } // namespace internal
66 } // namespace ash 67 } // namespace ash
67 68
68 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ 69 #endif // ASH_SYSTEM_IME_TRAY_IME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698