Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1135)

Unified Diff: ash/common/system/chromeos/ime_menu/ime_list_view.h

Issue 2793153004: [Ash] Remove non-MD code from ImeListView and ImeListItemView (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e756514b1b32423ebd004de70b1d1e80837b71dd..932baed22a6694e731a34401d26b7777e78ab646 100644
--- a/ash/common/system/chromeos/ime_menu/ime_list_view.h
+++ b/ash/common/system/chromeos/ime_menu/ime_list_view.h
@@ -11,7 +11,7 @@
#include "ui/views/controls/button/button.h"
namespace ash {
-class MaterialKeyboardStatusRowView;
+class KeyboardStatusRow;
// The detailed view for showing IME list.
class ImeListView : public TrayDetailsView {
@@ -67,23 +67,12 @@ class ImeListView : public TrayDetailsView {
private:
friend class ImeListViewTestApi;
- // Appends the IMEs to the scrollable area of the detailed view.
- void AppendIMEList(const IMEInfoList& list);
-
- // Appends the IME listed to the scrollable area of the detailed view.
- void AppendIMEProperties(const IMEPropertyInfoList& property_list);
-
- // Appends the IMEs and properties to the scrollable area in the material
- // design IME menu.
+ // Appends the IMEs and properties to the IME menu's scrollable area.
void AppendImeListAndProperties(const IMEInfoList& list,
const IMEPropertyInfoList& property_list);
- // Appends the on-screen keyboard status to the last area of the detailed
- // view.
- void AppendKeyboardStatus();
-
- // Inserts the material on-screen keyboard status in the detailed view.
- void PrependMaterialKeyboardStatus();
+ // Initializes |keyboard_status_row_| and adds it above the scrollable list.
+ void PrependKeyboardStatusRow();
// Requests focus on the current IME if it was selected with keyboard so that
// accessible text will alert the user of the IME change.
@@ -91,10 +80,7 @@ class ImeListView : public TrayDetailsView {
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_status_view_;
+ KeyboardStatusRow* keyboard_status_row_;
// The id of the last item selected with keyboard. It will be empty if the
// item is not selected with keyboard.

Powered by Google App Engine
This is Rietveld 408576698