| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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_COMMON_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ | 5 #ifndef ASH_COMMON_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ |
| 6 #define ASH_COMMON_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ | 6 #define ASH_COMMON_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include "ash/common/system/accessibility_observer.h" | 10 #include "ash/common/system/accessibility_observer.h" |
| 11 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h" | 11 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h" |
| 12 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.
h" | 12 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.
h" |
| 13 #include "ash/common/system/ime/ime_observer.h" | 13 #include "ash/common/system/ime/ime_observer.h" |
| 14 #include "ash/common/system/tray/ime_info.h" | 14 #include "ash/common/system/tray/ime_info.h" |
| 15 #include "ash/common/system/tray/system_tray_item.h" | 15 #include "ash/common/system/tray/system_tray_item.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 | 19 |
| 20 namespace tray { | 20 namespace tray { |
| 21 class IMEDefaultView; | 21 class IMEDefaultView; |
| 22 class IMEDetailedView; | 22 class IMEDetailedView; |
| 23 } | 23 } |
| 24 | 24 |
| 25 class TrayItemView; | 25 class TrayItemView; |
| 26 | 26 |
| 27 // Controller for IME options in the system menu. Note this is separate from |
| 28 // the "opt-in" IME menu which can appear as a button in the system tray |
| 29 // area; that is controlled by ImeMenuTray. |
| 27 class ASH_EXPORT TrayIME : public SystemTrayItem, | 30 class ASH_EXPORT TrayIME : public SystemTrayItem, |
| 28 public IMEObserver, | 31 public IMEObserver, |
| 29 public AccessibilityObserver, | 32 public AccessibilityObserver, |
| 30 public VirtualKeyboardObserver { | 33 public VirtualKeyboardObserver { |
| 31 public: | 34 public: |
| 32 explicit TrayIME(SystemTray* system_tray); | 35 explicit TrayIME(SystemTray* system_tray); |
| 33 ~TrayIME() override; | 36 ~TrayIME() override; |
| 34 | 37 |
| 35 // Overridden from VirtualKeyboardObserver. | 38 // Overridden from VirtualKeyboardObserver. |
| 36 void OnKeyboardSuppressionChanged(bool suppressed) override; | 39 void OnKeyboardSuppressionChanged(bool suppressed) override; |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 | 94 |
| 92 // Whether the IME label and tray items should be visible. | 95 // Whether the IME label and tray items should be visible. |
| 93 bool is_visible_; | 96 bool is_visible_; |
| 94 | 97 |
| 95 DISALLOW_COPY_AND_ASSIGN(TrayIME); | 98 DISALLOW_COPY_AND_ASSIGN(TrayIME); |
| 96 }; | 99 }; |
| 97 | 100 |
| 98 } // namespace ash | 101 } // namespace ash |
| 99 | 102 |
| 100 #endif // ASH_COMMON_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ | 103 #endif // ASH_COMMON_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ |
| OLD | NEW |