Refactor AddScrollListItem() in system menu detailed views

ash/system/ime_menu/ime_list_view.cc

 // 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.
 
 #include "ash/system/ime_menu/ime_list_view.h"
 
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
@@ skipping 94 matching lines @@
   bool PerformAction(const ui::Event& event) override {
     ime_list_view_->set_last_item_selected_with_keyboard(
         ime_list_view_->should_focus_ime_after_selection_with_keyboard() &&
         event.type() == ui::EventType::ET_KEY_PRESSED);
     ime_list_view_->HandleViewClicked(this);
     return true;
   }
 
   void OnFocus() override {
     ActionableView::OnFocus();
-    if (ime_list_view_ && ime_list_view_->scroll_content())
-      ime_list_view_->scroll_content()->ScrollRectToVisible(bounds());
+    if (ime_list_view_)
+      ime_list_view_->ScrollItemToVisible(this);
   }
 
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
     ActionableView::GetAccessibleNodeData(node_data);
     node_data->role = ui::AX_ROLE_CHECK_BOX;
     const ui::AXCheckedState checked_state =
         selected_ ? ui::AX_CHECKED_STATE_TRUE : ui::AX_CHECKED_STATE_FALSE;
     node_data->AddIntAttribute(ui::AX_ATTR_CHECKED_STATE, checked_state);
   }
 
@@ skipping 87 matching lines @@
   if (show_keyboard_toggle)
     PrependKeyboardStatusRow();
 
   Layout();
   SchedulePaint();
 
   if (should_focus_ime_after_selection_with_keyboard_ &&
       last_item_selected_with_keyboard_) {
     FocusCurrentImeIfNeeded();
   } else if (current_ime_view_) {
-    scroll_content()->ScrollRectToVisible(current_ime_view_->bounds());
+    ScrollItemToVisible(current_ime_view_);
   }
 }
 
 void ImeListView::ResetImeListView() {
   // Children are removed from the view hierarchy and deleted in Reset().
   Reset();
   keyboard_status_row_ = nullptr;
   current_ime_view_ = nullptr;
 }
 
+void ImeListView::ScrollItemToVisible(views::View* item_view) {
+  if (scroll_content())
+    scroll_content()->ScrollRectToVisible(item_view->bounds());
+}
+
 void ImeListView::CloseImeListView() {
   last_selected_item_id_.clear();
   current_ime_view_ = nullptr;
   last_item_selected_with_keyboard_ = false;
   GetWidget()->Close();
 }
 
 void ImeListView::AppendImeListAndProperties(
     const IMEInfoList& list,
     const IMEPropertyInfoList& property_list) {
@@ skipping 72 matching lines @@
   last_item_selected_with_keyboard_ = false;
 }
 
 void ImeListView::VisibilityChanged(View* starting_from, bool is_visible) {
   if (!is_visible || (should_focus_ime_after_selection_with_keyboard_ &&
                       last_item_selected_with_keyboard_) ||
       !current_ime_view_) {
     return;
   }
 
-  scroll_content()->ScrollRectToVisible(current_ime_view_->bounds());
+  ScrollItemToVisible(current_ime_view_);
 }
 
 void ImeListView::FocusCurrentImeIfNeeded() {
   views::FocusManager* manager = GetFocusManager();
   if (!manager || manager->GetFocusedView() || last_selected_item_id_.empty())
     return;
 
   for (auto ime_map : ime_map_) {
     if (ime_map.second == last_selected_item_id_) {
       (ime_map.first)->RequestFocus();
@@ skipping 12 matching lines @@
 ImeListViewTestApi::ImeListViewTestApi(ImeListView* ime_list_view)
     : ime_list_view_(ime_list_view) {}
 
 ImeListViewTestApi::~ImeListViewTestApi() {}
 
 views::View* ImeListViewTestApi::GetToggleView() const {
   return ime_list_view_->keyboard_status_row_->toggle();
 }
 
 }  // namespace ash