Commit 506445a2 authored by Rachel Wong's avatar Rachel Wong Committed by Commit Bot

Unify implementations of GetFirstResultView.

This CL makes the SearchResultBaseView::GetFirstResultView method
non-virtual, adds a default implementation, and removes the existing
overrides. The default implementation matches the existing override
implementations.

Bug: None
Change-Id: I51188cbc19d4564ddd9677915304d489f30b03c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2309495Reviewed-by: default avatarToni Baržić <tbarzic@chromium.org>
Commit-Queue: Rachel Wong <wrong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791121}
parent 0122e2a2
...@@ -146,9 +146,6 @@ class TestContainer : public TestContainerDelegateHarness, ...@@ -146,9 +146,6 @@ class TestContainer : public TestContainerDelegateHarness,
DCHECK_LT(index, search_result_views_.size()); DCHECK_LT(index, search_result_views_.size());
return search_result_views_[index].get(); return search_result_views_[index].get();
} }
SearchResultBaseView* GetFirstResultView() override {
return GetResultViewAt(0);
}
private: private:
int DoUpdate() override { return search_result_views_.size(); } int DoUpdate() override { return search_result_views_.size(); }
......
...@@ -365,10 +365,6 @@ bool SearchResultAnswerCardView::OnKeyPressed(const ui::KeyEvent& event) { ...@@ -365,10 +365,6 @@ bool SearchResultAnswerCardView::OnKeyPressed(const ui::KeyEvent& event) {
return SearchResultContainerView::OnKeyPressed(event); return SearchResultContainerView::OnKeyPressed(event);
} }
SearchResultBaseView* SearchResultAnswerCardView::GetFirstResultView() {
return num_results() <= 0 ? nullptr : search_answer_container_view_;
}
SearchResultBaseView* SearchResultAnswerCardView::GetResultViewAt( SearchResultBaseView* SearchResultAnswerCardView::GetResultViewAt(
size_t index) { size_t index) {
DCHECK_EQ(index, 0u); DCHECK_EQ(index, 0u);
......
...@@ -27,7 +27,6 @@ class APP_LIST_EXPORT SearchResultAnswerCardView ...@@ -27,7 +27,6 @@ class APP_LIST_EXPORT SearchResultAnswerCardView
// Overridden from SearchResultContainerView: // Overridden from SearchResultContainerView:
int DoUpdate() override; int DoUpdate() override;
bool OnKeyPressed(const ui::KeyEvent& event) override; bool OnKeyPressed(const ui::KeyEvent& event) override;
SearchResultBaseView* GetFirstResultView() override;
SearchResultBaseView* GetResultViewAt(size_t index) override; SearchResultBaseView* GetResultViewAt(size_t index) override;
views::View* GetAnswerCardResultViewForTest() const; views::View* GetAnswerCardResultViewForTest() const;
......
...@@ -81,7 +81,7 @@ void SearchResultContainerView::ListItemsChanged(size_t /*start*/, ...@@ -81,7 +81,7 @@ void SearchResultContainerView::ListItemsChanged(size_t /*start*/,
} }
SearchResultBaseView* SearchResultContainerView::GetFirstResultView() { SearchResultBaseView* SearchResultContainerView::GetFirstResultView() {
return nullptr; return num_results_ <= 0 ? nullptr : GetResultViewAt(0);
} }
void SearchResultContainerView::SetShown(bool shown) { void SearchResultContainerView::SetShown(bool shown) {
......
...@@ -83,7 +83,7 @@ class APP_LIST_EXPORT SearchResultContainerView : public views::View, ...@@ -83,7 +83,7 @@ class APP_LIST_EXPORT SearchResultContainerView : public views::View,
// Returns the first result in the container view. Returns nullptr if it does // Returns the first result in the container view. Returns nullptr if it does
// not exist. // not exist.
virtual SearchResultBaseView* GetFirstResultView(); SearchResultBaseView* GetFirstResultView();
// Called from SearchResultPageView OnShown/OnHidden // Called from SearchResultPageView OnShown/OnHidden
void SetShown(bool shown); void SetShown(bool shown);
......
...@@ -184,11 +184,6 @@ SearchResultView* SearchResultListView::GetResultViewAt(size_t index) { ...@@ -184,11 +184,6 @@ SearchResultView* SearchResultListView::GetResultViewAt(size_t index) {
return search_result_views_[index]; return search_result_views_[index];
} }
SearchResultBaseView* SearchResultListView::GetFirstResultView() {
DCHECK(!results_container_->children().empty());
return num_results() <= 0 ? nullptr : search_result_views_[0];
}
int SearchResultListView::DoUpdate() { int SearchResultListView::DoUpdate() {
if (!GetWidget() || !GetWidget()->IsVisible()) { if (!GetWidget() || !GetWidget()->IsVisible()) {
for (size_t i = 0; i < results_container_->children().size(); ++i) { for (size_t i = 0; i < results_container_->children().size(); ++i) {
......
...@@ -50,7 +50,6 @@ class APP_LIST_EXPORT SearchResultListView : public SearchResultContainerView { ...@@ -50,7 +50,6 @@ class APP_LIST_EXPORT SearchResultListView : public SearchResultContainerView {
// Overridden from SearchResultContainerView: // Overridden from SearchResultContainerView:
SearchResultView* GetResultViewAt(size_t index) override; SearchResultView* GetResultViewAt(size_t index) override;
SearchResultBaseView* GetFirstResultView() override;
AppListMainView* app_list_main_view() const { return main_view_; } AppListMainView* app_list_main_view() const { return main_view_; }
......
...@@ -122,11 +122,6 @@ SearchResultTileItemView* SearchResultTileItemListView::GetResultViewAt( ...@@ -122,11 +122,6 @@ SearchResultTileItemView* SearchResultTileItemListView::GetResultViewAt(
return tile_views_[index]; return tile_views_[index];
} }
SearchResultBaseView* SearchResultTileItemListView::GetFirstResultView() {
DCHECK(!tile_views_.empty());
return num_results() <= 0 ? nullptr : tile_views_[0];
}
int SearchResultTileItemListView::DoUpdate() { int SearchResultTileItemListView::DoUpdate() {
if (!GetWidget() || !GetWidget()->IsVisible() || !GetWidget()->IsActive()) { if (!GetWidget() || !GetWidget()->IsVisible() || !GetWidget()->IsActive()) {
for (size_t i = 0; i < max_search_result_tiles_; ++i) { for (size_t i = 0; i < max_search_result_tiles_; ++i) {
......
...@@ -32,7 +32,6 @@ class APP_LIST_EXPORT SearchResultTileItemListView ...@@ -32,7 +32,6 @@ class APP_LIST_EXPORT SearchResultTileItemListView
// Overridden from SearchResultContainerView: // Overridden from SearchResultContainerView:
SearchResultTileItemView* GetResultViewAt(size_t index) override; SearchResultTileItemView* GetResultViewAt(size_t index) override;
SearchResultBaseView* GetFirstResultView() override;
// Overridden from views::View: // Overridden from views::View:
const char* GetClassName() const override; const char* GetClassName() const override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment