| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_IME_MENU_IME_MENU_TRAY_H_ | 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ |
| 6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ | 6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/common/system/ime/ime_observer.h" | 9 #include "ash/common/system/ime/ime_observer.h" |
| 10 #include "ash/common/system/tray/system_tray_delegate.h" | 10 #include "ash/common/system/tray/system_tray_delegate.h" |
| 11 #include "ash/common/system/tray/tray_background_view.h" | 11 #include "ash/common/system/tray/tray_background_view.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 | 13 |
| 14 namespace views { | 14 namespace views { |
| 15 class Label; | 15 class Label; |
| 16 } // namespace views | 16 } // namespace views |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 class StatusAreaWidget; | 19 class StatusAreaWidget; |
| 20 class ViewObserver; |
| 20 class WmWindow; | 21 class WmWindow; |
| 21 | 22 |
| 22 // The tray item for IME menu. | 23 // The tray item for IME menu. |
| 23 class ASH_EXPORT ImeMenuTray : public TrayBackgroundView, public IMEObserver { | 24 class ASH_EXPORT ImeMenuTray : public TrayBackgroundView, public IMEObserver { |
| 24 public: | 25 public: |
| 25 explicit ImeMenuTray(WmShelf* wm_shelf); | 26 explicit ImeMenuTray(WmShelf* wm_shelf, ViewObserver* view_observer); |
| 26 ~ImeMenuTray() override; | 27 ~ImeMenuTray() override; |
| 27 | 28 |
| 28 // TrayBackgroundView: | 29 // TrayBackgroundView: |
| 29 void SetShelfAlignment(ShelfAlignment alignment) override; | 30 void SetShelfAlignment(ShelfAlignment alignment) override; |
| 30 base::string16 GetAccessibleNameForTray() override; | 31 base::string16 GetAccessibleNameForTray() override; |
| 31 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; | 32 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; |
| 32 void ClickedOutsideBubble() override; | 33 void ClickedOutsideBubble() override; |
| 33 bool PerformAction(const ui::Event& event) override; | 34 bool PerformAction(const ui::Event& event) override; |
| 34 | 35 |
| 35 // IMEObserver: | 36 // IMEObserver: |
| (...skipping 13 matching lines...) Expand all Loading... |
| 49 | 50 |
| 50 views::Label* label_; | 51 views::Label* label_; |
| 51 IMEInfo current_ime_; | 52 IMEInfo current_ime_; |
| 52 | 53 |
| 53 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); | 54 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); |
| 54 }; | 55 }; |
| 55 | 56 |
| 56 } // namespace ash | 57 } // namespace ash |
| 57 | 58 |
| 58 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ | 59 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ |
| OLD | NEW |