Remove SearchBoxViewBase::GetSelectedViewInContentsView

It's currently always returning nullptr.

BUG=None

Change-Id: Ib953cf14ae956309ef6077adb000edbbec8561f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472701Reviewed-by: Jenny Zhang <jennyz@chromium.org>
Commit-Queue: Toni Baržić <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817286}

ash/app_list/views/app_list_page.cc

@@ -41,10 +41,6 @@ void AppListPage::UpdatePageBoundsForState(AppListState state,
       GetPageBoundsForState(state, contents_bounds, search_box_bounds));
 }
 
-views::View* AppListPage::GetSelectedView() const {
-  return nullptr;
-}
-
 views::View* AppListPage::GetFirstFocusableView() {
   return nullptr;
 }

ash/app_list/views/app_list_page.h

@@ -101,9 +101,6 @@ class APP_LIST_EXPORT AppListPage : public views::View {
     contents_view_ = contents_view;
   }
 
-  // Returns selected view in this page.
-  virtual views::View* GetSelectedView() const;
-
   // Returns the first focusable view in this page.
   virtual views::View* GetFirstFocusableView();
 

ash/app_list/views/contents_view.cc

@@ -661,10 +661,6 @@ void ContentsView::TransitionChanged() {
   UpdateSearchBoxAnimation(progress, current_state, target_state);
 }
 
-views::View* ContentsView::GetSelectedView() const {
-  return app_list_pages_[GetActivePageIndex()]->GetSelectedView();
-}
-
 void ContentsView::UpdateYPositionAndOpacity() {
   const int current_page = pagination_model_.has_transition()
                                ? pagination_model_.transition().target_page

ash/app_list/views/contents_view.h

@@ -194,9 +194,6 @@ class APP_LIST_EXPORT ContentsView : public views::View,
   void TransitionStarted() override;
   void TransitionChanged() override;
 
-  // Returns selected view in active page.
-  views::View* GetSelectedView() const;
-
   // Updates y position and opacity of the items in this view during dragging.
   void UpdateYPositionAndOpacity();
 

ash/app_list/views/search_box_view.cc

@@ -134,12 +134,6 @@ void SearchBoxView::ClearSearch() {
       true, false /*triggered_by_contents_change*/);
 }
 
-views::View* SearchBoxView::GetSelectedViewInContentsView() {
-  if (!contents_view_)
-    return nullptr;
-  return contents_view_->GetSelectedView();
-}
-
 void SearchBoxView::HandleSearchBoxEvent(ui::LocatedEvent* located_event) {
   if (located_event->type() == ui::ET_MOUSEWHEEL) {
     if (!app_list_view_->HandleScroll(

ash/app_list/views/search_box_view.h

@@ -50,7 +50,6 @@ class APP_LIST_EXPORT SearchBoxView : public SearchBoxViewBase,
 
   // Overridden from SearchBoxViewBase:
   void ClearSearch() override;
-  views::View* GetSelectedViewInContentsView() override;
   void HandleSearchBoxEvent(ui::LocatedEvent* located_event) override;
   void ModelChanged() override;
   void UpdateKeyboardVisibility() override;

ash/search_box/search_box_view_base.cc

@@ -175,19 +175,6 @@ class SearchBoxTextfield : public views::Textfield {
   ~SearchBoxTextfield() override = default;
 
   // Overridden from views::View:
-  void ShowContextMenu(const gfx::Point& p,
-                       ui::MenuSourceType source_type) override {
-    views::View* selected_view =
-        search_box_view_->GetSelectedViewInContentsView();
-    if (source_type != ui::MENU_SOURCE_KEYBOARD || !selected_view) {
-      views::Textfield::ShowContextMenu(p, source_type);
-      return;
-    }
-    selected_view->ShowContextMenu(
-        selected_view->GetKeyboardContextMenuLocation(),
-        ui::MENU_SOURCE_KEYBOARD);
-  }
-
   void OnFocus() override {
     search_box_view_->OnSearchBoxFocusedChanged();
     Textfield::OnFocus();
@@ -451,10 +438,6 @@ void SearchBoxViewBase::ClearSearch() {
   NotifyQueryChanged();
 }
 
-views::View* SearchBoxViewBase::GetSelectedViewInContentsView() {
-  return nullptr;
-}
-
 void SearchBoxViewBase::NotifyQueryChanged() {
   DCHECK(delegate_);
   delegate_->QueryChanged(this);

ash/search_box/search_box_view_base.h

@@ -118,9 +118,6 @@ class SearchBoxViewBase : public views::WidgetDelegateView,
 
   virtual void ClearSearch();
 
-  // Returns selected view in contents view.
-  virtual views::View* GetSelectedViewInContentsView();
-
  protected:
   // Fires query change notification.
   void NotifyQueryChanged();