[Ash] Remove non-MD code from ImeListView and ImeListItemView

ash/common/system/chromeos/ime_menu/ime_list_view.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_
 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_
 
 #include "ash/ash_export.h"
 #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;
+class KeyboardStatusRow;
 
-// The detailed view for showing IME list.
+// Base class used to represent a selecatable list of available IMEs.
+// Optionally shows a toggle which is used to enable or disable the invocation
+// of the virtual keyboard.
 class ImeListView : public TrayDetailsView {
  public:
   enum SingleImeBehavior {
     // Shows the IME menu if there's only one IME in system.
     SHOW_SINGLE_IME,
     // Hides the IME menu if there's only one IME in system.
     HIDE_SINGLE_IME
   };
 
   ImeListView(SystemTrayItem* owner);
@@ skipping 33 matching lines @@
   void HandleViewClicked(views::View* view) override;
   void HandleButtonPressed(views::Button* sender,
                            const ui::Event& event) override;
 
   // views::View:
   void VisibilityChanged(View* starting_from, bool is_visible) override;
 
  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.
   void FocusCurrentImeIfNeeded();
 
   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.
   std::string last_selected_item_id_;
 
   // True if the last item is selected with keyboard.
   bool last_item_selected_with_keyboard_;
 
   // True if focus should be requested after switching IMEs with keyboard in
   // order to trigger spoken feedback with ChromeVox enabled.
@@ skipping 18 matching lines @@
 
  private:
   ImeListView* ime_list_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ImeListViewTestApi);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_LIST_VIEW_H_