| 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_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ | 5 #ifndef ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ |
| 6 #define ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ | 6 #define ASH_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/tray/system_tray_delegate.h" | 11 #include "ash/common/system/tray/system_tray_delegate.h" |
| 11 #include "ash/common/system/tray/system_tray_item.h" | 12 #include "ash/common/system/tray/system_tray_item.h" |
| 12 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h" | 13 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h" |
| 13 #include "ash/system/ime/ime_observer.h" | 14 #include "ash/system/ime/ime_observer.h" |
| 14 #include "ash/system/tray_accessibility.h" | |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 | 16 |
| 17 namespace views { | 17 namespace views { |
| 18 class Label; | 18 class Label; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 struct IMEInfo; | 22 struct IMEInfo; |
| 23 | 23 |
| 24 namespace tray { | 24 namespace tray { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 IMEPropertyInfoList property_list_; | 85 IMEPropertyInfoList property_list_; |
| 86 // Whether the IME label and tray items should be visible. | 86 // Whether the IME label and tray items should be visible. |
| 87 bool is_visible_; | 87 bool is_visible_; |
| 88 | 88 |
| 89 DISALLOW_COPY_AND_ASSIGN(TrayIME); | 89 DISALLOW_COPY_AND_ASSIGN(TrayIME); |
| 90 }; | 90 }; |
| 91 | 91 |
| 92 } // namespace ash | 92 } // namespace ash |
| 93 | 93 |
| 94 #endif // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ | 94 #endif // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ |
| OLD | NEW |