OLD | NEW |
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 #include "base/memory/weak_ptr.h" |
10 | 11 |
11 namespace views { | 12 namespace views { |
12 class Label; | 13 class Label; |
13 } | 14 } |
14 | 15 |
15 namespace ash { | 16 namespace ash { |
16 | 17 |
17 struct IMEInfo; | 18 struct IMEInfo; |
18 | 19 |
19 namespace internal { | 20 namespace internal { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 | 55 |
55 // Overridden from IMEObserver. | 56 // Overridden from IMEObserver. |
56 virtual void OnIMERefresh(bool show_message) OVERRIDE; | 57 virtual void OnIMERefresh(bool show_message) OVERRIDE; |
57 | 58 |
58 TrayItemView* tray_label_; | 59 TrayItemView* tray_label_; |
59 tray::IMEDefaultView* default_; | 60 tray::IMEDefaultView* default_; |
60 tray::IMEDetailedView* detailed_; | 61 tray::IMEDetailedView* detailed_; |
61 | 62 |
62 bool message_shown_; | 63 bool message_shown_; |
63 | 64 |
| 65 base::WeakPtrFactory<TrayIME> weak_factory_; |
| 66 |
64 DISALLOW_COPY_AND_ASSIGN(TrayIME); | 67 DISALLOW_COPY_AND_ASSIGN(TrayIME); |
65 }; | 68 }; |
66 | 69 |
67 } // namespace internal | 70 } // namespace internal |
68 } // namespace ash | 71 } // namespace ash |
69 | 72 |
70 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ | 73 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ |
OLD | NEW |