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 18 matching lines...) Expand all Loading... |
29 base::string16 GetAccessibleNameForTray() override; | 29 base::string16 GetAccessibleNameForTray() override; |
30 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; | 30 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; |
31 void ClickedOutsideBubble() override; | 31 void ClickedOutsideBubble() override; |
32 bool PerformAction(const ui::Event& event) override; | 32 bool PerformAction(const ui::Event& event) override; |
33 | 33 |
34 // KeyboardUIObserver: | 34 // KeyboardUIObserver: |
35 void OnKeyboardEnabledStateChanged(bool new_enabled) override; | 35 void OnKeyboardEnabledStateChanged(bool new_enabled) override; |
36 | 36 |
37 // keyboard::KeyboardControllerObserver: | 37 // keyboard::KeyboardControllerObserver: |
38 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; | 38 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; |
| 39 void OnKeyboardHidden() override; |
39 | 40 |
40 private: | 41 private: |
41 // 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 |
42 // alignment of the shelf. | 43 // alignment of the shelf. |
43 void SetIconBorderForShelfAlignment(); | 44 void SetIconBorderForShelfAlignment(); |
44 | 45 |
45 void ObserveKeyboardController(); | 46 void ObserveKeyboardController(); |
46 void UnobserveKeyboardController(); | 47 void UnobserveKeyboardController(); |
47 | 48 |
48 // Weak pointer, will be parented by TrayContainer for its lifetime. | 49 // Weak pointer, will be parented by TrayContainer for its lifetime. |
49 views::ImageView* icon_; | 50 views::ImageView* icon_; |
50 | 51 |
51 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); | 52 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); |
52 }; | 53 }; |
53 | 54 |
54 } // namespace ash | 55 } // namespace ash |
55 | 56 |
56 #endif // ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ | 57 #endif // ASH_COMMON_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ |
OLD | NEW |