| 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..89da8ca5c6cc0819955edd9b6947d70c00473462 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,7 +35,12 @@ 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;
|
| +
|
| // To allow the test class to access |ime_map_|.
|
| friend class ImeMenuTrayTest;
|
|
|
| @@ -53,9 +59,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_;
|
| + MaterialKeyboardStatusRowView* material_keyboard_statuts_view_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ImeListView);
|
| };
|
|
|