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 |
|
tdanderson
2017/01/12 00:16:15
Did you manually verify this on both the opt-in IM
Azure Wei
2017/01/12 01:20:54
This CL only works with opt-in IME menu. For IME d
tdanderson
2017/01/12 21:27:33
I would strongly prefer a solution which worked fo
| |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ | 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ |
| 6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ | 6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ |
| 7 | 7 |
| 8 #include "ash/common/system/tray/ime_info.h" | 8 #include "ash/common/system/tray/ime_info.h" |
| 9 #include "ash/common/system/tray/tray_details_view.h" | 9 #include "ash/common/system/tray/tray_details_view.h" |
| 10 #include "ui/views/controls/button/button.h" | 10 #include "ui/views/controls/button/button.h" |
| 11 | 11 |
| 12 namespace ash { | 12 namespace ash { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 52 | 52 |
| 53 bool should_focus_ime_after_selection_with_keyboard() const { | 53 bool should_focus_ime_after_selection_with_keyboard() const { |
| 54 return should_focus_ime_after_selection_with_keyboard_; | 54 return should_focus_ime_after_selection_with_keyboard_; |
| 55 } | 55 } |
| 56 | 56 |
| 57 // TrayDetailsView: | 57 // TrayDetailsView: |
| 58 void HandleViewClicked(views::View* view) override; | 58 void HandleViewClicked(views::View* view) override; |
| 59 void HandleButtonPressed(views::Button* sender, | 59 void HandleButtonPressed(views::Button* sender, |
| 60 const ui::Event& event) override; | 60 const ui::Event& event) override; |
| 61 | 61 |
| 62 // views::View: | |
| 63 void VisibilityChanged(View* starting_from, bool is_visible) override; | |
| 64 | |
| 62 private: | 65 private: |
| 63 // To allow the test class to access |ime_map_|. | 66 // To allow the test class to access |ime_map_|. |
| 64 friend class ImeMenuTrayTest; | 67 friend class ImeMenuTrayTest; |
| 65 | 68 |
| 66 // Appends the IMEs to the scrollable area of the detailed view. | 69 // Appends the IMEs to the scrollable area of the detailed view. |
| 67 void AppendIMEList(const IMEInfoList& list); | 70 void AppendIMEList(const IMEInfoList& list); |
| 68 | 71 |
| 69 // Appends the IME listed to the scrollable area of the detailed view. | 72 // Appends the IME listed to the scrollable area of the detailed view. |
| 70 void AppendIMEProperties(const IMEPropertyInfoList& property_list); | 73 void AppendIMEProperties(const IMEPropertyInfoList& property_list); |
| 71 | 74 |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 96 // item is not selected with keyboard. | 99 // item is not selected with keyboard. |
| 97 std::string last_selected_item_id_; | 100 std::string last_selected_item_id_; |
| 98 | 101 |
| 99 // True if the last item is selected with keyboard. | 102 // True if the last item is selected with keyboard. |
| 100 bool last_item_selected_with_keyboard_; | 103 bool last_item_selected_with_keyboard_; |
| 101 | 104 |
| 102 // True if focus should be requested after switching IMEs with keyboard in | 105 // True if focus should be requested after switching IMEs with keyboard in |
| 103 // order to trigger spoken feedback with ChromeVox enabled. | 106 // order to trigger spoken feedback with ChromeVox enabled. |
| 104 bool should_focus_ime_after_selection_with_keyboard_; | 107 bool should_focus_ime_after_selection_with_keyboard_; |
| 105 | 108 |
| 109 // The item view of the current selected IME. | |
| 110 views::View* current_ime_view_; | |
| 111 | |
| 106 DISALLOW_COPY_AND_ASSIGN(ImeListView); | 112 DISALLOW_COPY_AND_ASSIGN(ImeListView); |
| 107 }; | 113 }; |
| 108 | 114 |
| 109 } // namespace ash | 115 } // namespace ash |
| 110 | 116 |
| 111 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ | 117 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_ |
| OLD | NEW |