Chromium Code Reviews| 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" |
| 11 #include "ui/keyboard/keyboard_controller_observer.h" | 11 #include "ui/keyboard/keyboard_controller_observer.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace views { |
| 14 class ImageView; | 14 class ImageView; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 class LogoutButtonTray; | |
|
James Cook
2016/08/09 00:25:17
not needed
yiyix
2016/08/11 01:23:18
It is from the 1st approach. I forget to clean it.
| |
| 19 class WmShelfObserver; | |
| 18 | 20 |
| 19 // TODO(sky): make this visible on non-chromeos platforms. | 21 // TODO(sky): make this visible on non-chromeos platforms. |
| 20 class VirtualKeyboardTray : public TrayBackgroundView, | 22 class VirtualKeyboardTray : public TrayBackgroundView, |
| 21 public KeyboardUIObserver, | 23 public KeyboardUIObserver, |
| 22 public keyboard::KeyboardControllerObserver { | 24 public keyboard::KeyboardControllerObserver { |
| 23 public: | 25 public: |
| 24 explicit VirtualKeyboardTray(WmShelf* wm_shelf); | 26 explicit VirtualKeyboardTray(WmShelf* wm_shelf, |
|
James Cook
2016/08/09 00:25:17
no explicit
yiyix
2016/08/11 01:23:18
Done.
| |
| 27 WmShelfObserver* wm_shelf_observer); | |
| 25 ~VirtualKeyboardTray() override; | 28 ~VirtualKeyboardTray() override; |
| 26 | 29 |
| 27 // TrayBackgroundView: | 30 // TrayBackgroundView: |
| 28 void SetShelfAlignment(ShelfAlignment alignment) override; | 31 void SetShelfAlignment(ShelfAlignment alignment) override; |
| 29 base::string16 GetAccessibleNameForTray() override; | 32 base::string16 GetAccessibleNameForTray() override; |
| 30 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; | 33 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; |
| 31 void ClickedOutsideBubble() override; | 34 void ClickedOutsideBubble() override; |
| 32 bool PerformAction(const ui::Event& event) override; | 35 bool PerformAction(const ui::Event& event) override; |
| 33 | 36 |
| 34 // KeyboardUIObserver: | 37 // KeyboardUIObserver: |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 47 | 50 |
| 48 // Weak pointer, will be parented by TrayContainer for its lifetime. | 51 // Weak pointer, will be parented by TrayContainer for its lifetime. |
| 49 views::ImageView* icon_; | 52 views::ImageView* icon_; |
| 50 | 53 |
| 51 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); | 54 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); |
| 52 }; | 55 }; |
| 53 | 56 |
| 54 } // namespace ash | 57 } // namespace ash |
| 55 | 58 |
| 56 #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 |