| 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 | 10 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 class TrayIME : public SystemTrayItem, | 26 class TrayIME : public SystemTrayItem, |
| 27 public IMEObserver { | 27 public IMEObserver { |
| 28 public: | 28 public: |
| 29 explicit TrayIME(SystemTray* system_tray); | 29 explicit TrayIME(SystemTray* system_tray); |
| 30 virtual ~TrayIME(); | 30 virtual ~TrayIME(); |
| 31 | 31 |
| 32 private: | 32 private: |
| 33 void UpdateTrayLabel(const IMEInfo& info, size_t count); | 33 void UpdateTrayLabel(const IMEInfo& info, size_t count); |
| 34 | 34 |
| 35 // Overridden from SystemTrayItem. | 35 // Overridden from SystemTrayItem. |
| 36 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; | 36 virtual views::View* CreateTrayView(user::LoginStatus status) override; |
| 37 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; | 37 virtual views::View* CreateDefaultView(user::LoginStatus status) override; |
| 38 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; | 38 virtual views::View* CreateDetailedView(user::LoginStatus status) override; |
| 39 virtual void DestroyTrayView() OVERRIDE; | 39 virtual void DestroyTrayView() override; |
| 40 virtual void DestroyDefaultView() OVERRIDE; | 40 virtual void DestroyDefaultView() override; |
| 41 virtual void DestroyDetailedView() OVERRIDE; | 41 virtual void DestroyDetailedView() override; |
| 42 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; | 42 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; |
| 43 virtual void UpdateAfterShelfAlignmentChange( | 43 virtual void UpdateAfterShelfAlignmentChange( |
| 44 ShelfAlignment alignment) OVERRIDE; | 44 ShelfAlignment alignment) override; |
| 45 | 45 |
| 46 // Overridden from IMEObserver. | 46 // Overridden from IMEObserver. |
| 47 virtual void OnIMERefresh() OVERRIDE; | 47 virtual void OnIMERefresh() override; |
| 48 | 48 |
| 49 TrayItemView* tray_label_; | 49 TrayItemView* tray_label_; |
| 50 tray::IMEDefaultView* default_; | 50 tray::IMEDefaultView* default_; |
| 51 tray::IMEDetailedView* detailed_; | 51 tray::IMEDetailedView* detailed_; |
| 52 | 52 |
| 53 DISALLOW_COPY_AND_ASSIGN(TrayIME); | 53 DISALLOW_COPY_AND_ASSIGN(TrayIME); |
| 54 }; | 54 }; |
| 55 | 55 |
| 56 } // namespace ash | 56 } // namespace ash |
| 57 | 57 |
| 58 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ | 58 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ |
| OLD | NEW |