Chromium Code Reviews| Index: ash/common/system/chromeos/ime_menu/ime_list_view.h |
| diff --git a/ash/common/system/chromeos/ime_menu/ime_list_view.h b/ash/common/system/chromeos/ime_menu/ime_list_view.h |
| index 83e5980cd48af7da73ed1d35f0b50a301ebea501..7f12cddc06a9d6ca6902054849190ca6567f35f4 100644 |
| --- a/ash/common/system/chromeos/ime_menu/ime_list_view.h |
| +++ b/ash/common/system/chromeos/ime_menu/ime_list_view.h |
| @@ -7,6 +7,7 @@ |
| #include "ash/common/system/tray/ime_info.h" |
| #include "ash/common/system/tray/tray_details_view.h" |
| +#include "ui/views/controls/button/button.h" |
| namespace ash { |
| // The detailed view for showing IME list. |
| @@ -34,10 +35,18 @@ class ImeListView : public TrayDetailsView { |
| // TrayDetailsView: |
| void HandleViewClicked(views::View* view) override; |
| + // views::ButtonListener: |
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override; |
| + |
| private: |
| + class MaterialKeyboardStatusRowView; |
|
tdanderson
2016/11/03 21:17:06
I don't think this should be necessary?
Azure Wei
2016/11/04 01:28:35
Removed.
|
| + |
| // To allow the test class to access |ime_map_|. |
| friend class ImeMenuTrayTest; |
| + // Removes (and destroys) all child views. |
| + void ResetImeListView(); |
| + |
| // Appends the IMEs to the scrollable area of the detailed view. |
| void AppendIMEList(const IMEInfoList& list); |
| @@ -53,9 +62,14 @@ class ImeListView : public TrayDetailsView { |
| // view. |
| void AppendKeyboardStatus(); |
| + // Appends the meterial on-screen keyboard status to the top area of the |
| + // detailed view. |
| + void AppendMaterialKeyboardStatus(); |
| + |
| std::map<views::View*, std::string> ime_map_; |
| std::map<views::View*, std::string> property_map_; |
| views::View* keyboard_status_; |
|
tdanderson
2016/11/03 21:17:06
Can you please add a comment above this to say "No
Azure Wei
2016/11/04 01:28:35
Done.
|
| + MaterialKeyboardStatusRowView* material_keyboard_statuts_view_; |
|
tdanderson
2016/11/03 21:17:06
Similarly please add a comment above this member t
Azure Wei
2016/11/04 01:28:35
Done.
|
| DISALLOW_COPY_AND_ASSIGN(ImeListView); |
| }; |