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

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: Fix single-letter typo :(. 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
« no previous file with comments | « ash/system/drive/tray_drive.cc ('k') | ash/system/ime/tray_ime.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_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 11 matching lines...) Expand all
22 class IMEDefaultView; 22 class IMEDefaultView;
23 class IMEDetailedView; 23 class IMEDetailedView;
24 class IMENotificationView; 24 class IMENotificationView;
25 } 25 }
26 26
27 class TrayItemView; 27 class TrayItemView;
28 28
29 class TrayIME : public SystemTrayItem, 29 class TrayIME : public SystemTrayItem,
30 public IMEObserver { 30 public IMEObserver {
31 public: 31 public:
32 TrayIME(); 32 explicit TrayIME(SystemTray* system_tray);
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) OVERRIDE;
41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
42 virtual views::View* CreateNotificationView( 42 virtual views::View* CreateNotificationView(
(...skipping 16 matching lines...) Expand all
59 59
60 bool message_shown_; 60 bool message_shown_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(TrayIME); 62 DISALLOW_COPY_AND_ASSIGN(TrayIME);
63 }; 63 };
64 64
65 } // namespace internal 65 } // namespace internal
66 } // namespace ash 66 } // namespace ash
67 67
68 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ 68 #endif // ASH_SYSTEM_IME_TRAY_IME_H_
OLDNEW
« no previous file with comments | « ash/system/drive/tray_drive.cc ('k') | ash/system/ime/tray_ime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698