Chromium Code Reviews| 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/ime_info.h" | 10 #include "ash/common/system/tray/ime_info.h" |
| 11 #include "ash/common/system/tray/tray_background_view.h" | 11 #include "ash/common/system/tray/tray_background_view.h" |
| 12 #include "ash/common/system/tray/tray_bubble_wrapper.h" | 12 #include "ash/common/system/tray/tray_bubble_wrapper.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "ui/views/bubble/tray_bubble_view.h" | 14 #include "ui/views/bubble/tray_bubble_view.h" |
| 15 | 15 |
| 16 namespace views { | 16 namespace views { |
| 17 class Label; | 17 class Label; |
| 18 } // namespace views | 18 } // namespace views |
| 19 | 19 |
| 20 namespace ash { | 20 namespace ash { |
| 21 class StatusAreaWidget; | 21 class StatusAreaWidget; |
| 22 class WmShelfObserver; | |
| 22 class WmWindow; | 23 class WmWindow; |
| 23 | 24 |
| 24 // The tray item for IME menu, which shows the detailed view of a null single | 25 // The tray item for IME menu, which shows the detailed view of a null single |
| 25 // item. | 26 // item. |
| 26 class ASH_EXPORT ImeMenuTray : public TrayBackgroundView, | 27 class ASH_EXPORT ImeMenuTray : public TrayBackgroundView, |
| 27 public IMEObserver, | 28 public IMEObserver, |
| 28 public views::TrayBubbleView::Delegate { | 29 public views::TrayBubbleView::Delegate { |
| 29 public: | 30 public: |
| 30 explicit ImeMenuTray(WmShelf* wm_shelf); | 31 explicit ImeMenuTray(WmShelf* wm_shelf, WmShelfObserver* wm_shelf_observer); |
|
James Cook
2016/08/09 00:25:17
no explicit
We only use explicit for single-param
yiyix
2016/08/11 01:23:18
Done.
| |
| 31 ~ImeMenuTray() override; | 32 ~ImeMenuTray() override; |
| 32 | 33 |
| 33 // TrayBackgroundView: | 34 // TrayBackgroundView: |
| 34 void SetShelfAlignment(ShelfAlignment alignment) override; | 35 void SetShelfAlignment(ShelfAlignment alignment) override; |
| 35 base::string16 GetAccessibleNameForTray() override; | 36 base::string16 GetAccessibleNameForTray() override; |
| 36 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; | 37 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; |
| 37 void ClickedOutsideBubble() override; | 38 void ClickedOutsideBubble() override; |
| 38 bool PerformAction(const ui::Event& event) override; | 39 bool PerformAction(const ui::Event& event) override; |
| 39 | 40 |
| 40 // IMEObserver: | 41 // IMEObserver: |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 73 | 74 |
| 74 views::Label* label_; | 75 views::Label* label_; |
| 75 IMEInfo current_ime_; | 76 IMEInfo current_ime_; |
| 76 | 77 |
| 77 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); | 78 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); |
| 78 }; | 79 }; |
| 79 | 80 |
| 80 } // namespace ash | 81 } // namespace ash |
| 81 | 82 |
| 82 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ | 83 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ |
| OLD | NEW |