OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ | 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ |
6 #define ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ | 6 #define ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ |
7 | 7 |
8 #include "ash/common/keyboard/keyboard_ui_observer.h" | 8 #include "ash/common/keyboard/keyboard_ui_observer.h" |
9 #include "ash/common/system/tray/tray_background_view.h" | 9 #include "ash/common/system/tray/tray_background_view.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 // Creates a new border for the icon. The padding is determined based on the | 42 // Creates a new border for the icon. The padding is determined based on the |
43 // alignment of the shelf. | 43 // alignment of the shelf. |
44 void SetIconBorderForShelfAlignment(); | 44 void SetIconBorderForShelfAlignment(); |
45 | 45 |
46 void ObserveKeyboardController(); | 46 void ObserveKeyboardController(); |
47 void UnobserveKeyboardController(); | 47 void UnobserveKeyboardController(); |
48 | 48 |
49 // Weak pointer, will be parented by TrayContainer for its lifetime. | 49 // Weak pointer, will be parented by TrayContainer for its lifetime. |
50 views::ImageView* icon_; | 50 views::ImageView* icon_; |
51 | 51 |
| 52 WmShelf* wm_shelf_; |
| 53 |
52 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); | 54 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); |
53 }; | 55 }; |
54 | 56 |
55 } // namespace ash | 57 } // namespace ash |
56 | 58 |
57 #endif // ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ | 59 #endif // ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ |
OLD | NEW |