| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "ash/system/ime/ime_observer.h" | 9 #include "ash/system/ime/ime_observer.h" |
| 10 #include "ash/system/tray/system_tray_item.h" | 10 #include "ash/system/tray/system_tray_item.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 | 11 |
| 13 namespace views { | 12 namespace views { |
| 14 class Label; | 13 class Label; |
| 15 } | 14 } |
| 16 | 15 |
| 17 namespace ash { | 16 namespace ash { |
| 18 | 17 |
| 19 struct IMEInfo; | 18 struct IMEInfo; |
| 20 | 19 |
| 21 namespace internal { | 20 namespace internal { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 41 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; | 40 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; |
| 42 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; | 41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; |
| 43 virtual void DestroyTrayView() OVERRIDE; | 42 virtual void DestroyTrayView() OVERRIDE; |
| 44 virtual void DestroyDefaultView() OVERRIDE; | 43 virtual void DestroyDefaultView() OVERRIDE; |
| 45 virtual void DestroyDetailedView() OVERRIDE; | 44 virtual void DestroyDetailedView() OVERRIDE; |
| 46 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; | 45 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; |
| 47 | 46 |
| 48 // Overridden from IMEObserver. | 47 // Overridden from IMEObserver. |
| 49 virtual void OnIMERefresh() OVERRIDE; | 48 virtual void OnIMERefresh() OVERRIDE; |
| 50 | 49 |
| 51 scoped_ptr<TrayItemView> tray_label_; | 50 TrayItemView* tray_label_; |
| 52 scoped_ptr<tray::IMEDefaultView> default_; | 51 tray::IMEDefaultView* default_; |
| 53 scoped_ptr<tray::IMEDetailedView> detailed_; | 52 tray::IMEDetailedView* detailed_; |
| 54 | 53 |
| 55 DISALLOW_COPY_AND_ASSIGN(TrayIME); | 54 DISALLOW_COPY_AND_ASSIGN(TrayIME); |
| 56 }; | 55 }; |
| 57 | 56 |
| 58 } // namespace internal | 57 } // namespace internal |
| 59 } // namespace ash | 58 } // namespace ash |
| 60 | 59 |
| 61 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ | 60 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ |
| OLD | NEW |