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..0772daeb4652a5fdd2aaf319391f4e8163cc71a1 100644 |
| --- a/ash/common/system/chromeos/ime_menu/ime_list_view.h |
| +++ b/ash/common/system/chromeos/ime_menu/ime_list_view.h |
| @@ -7,8 +7,11 @@ |
| #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 { |
| +class MaterialKeyboardStatusRowView; |
| + |
| // The detailed view for showing IME list. |
| class ImeListView : public TrayDetailsView { |
| public: |
| @@ -34,10 +37,16 @@ class ImeListView : public TrayDetailsView { |
| // TrayDetailsView: |
| void HandleViewClicked(views::View* view) override; |
| + // views::ButtonListener: |
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override; |
| + |
| private: |
| // 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,16 @@ class ImeListView : public TrayDetailsView { |
| // view. |
| void AppendKeyboardStatus(); |
| + // Appends the meterial on-screen keyboard status to the top area of the |
|
tdanderson
2016/11/04 19:01:05
nit: "material"
Azure Wei
2016/11/05 02:26:19
Done.
|
| + // detailed view. |
| + void AppendMaterialKeyboardStatus(); |
| + |
| std::map<views::View*, std::string> ime_map_; |
| std::map<views::View*, std::string> property_map_; |
| + // On-screen keyboard view which is not used in material design. |
| views::View* keyboard_status_; |
| + // On-screen keyboard view which is only used in material design. |
| + MaterialKeyboardStatusRowView* material_keyboard_statuts_view_; |
| DISALLOW_COPY_AND_ASSIGN(ImeListView); |
| }; |