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

Unified Diff: ui/app_list/views/app_list_view_unittest.cc

Issue 896633005: Remove separate SearchResultListView from ContentsView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@separate_start_page_tile_container
Patch Set: insert_newline Created 5 years, 10 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
« no previous file with comments | « no previous file | ui/app_list/views/contents_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_view_unittest.cc
diff --git a/ui/app_list/views/app_list_view_unittest.cc b/ui/app_list/views/app_list_view_unittest.cc
index 8c5c73ac0a495b6f59451c5f0abffd739d67ffa5..42ea85b97589787537caebc8ab6fb5d2fda946b1 100644
--- a/ui/app_list/views/app_list_view_unittest.cc
+++ b/ui/app_list/views/app_list_view_unittest.cc
@@ -25,7 +25,6 @@
#include "ui/app_list/views/apps_grid_view.h"
#include "ui/app_list/views/contents_view.h"
#include "ui/app_list/views/search_box_view.h"
-#include "ui/app_list/views/search_result_list_view.h"
#include "ui/app_list/views/search_result_page_view.h"
#include "ui/app_list/views/search_result_tile_item_view.h"
#include "ui/app_list/views/start_page_view.h"
@@ -600,13 +599,8 @@ void AppListViewTestContext::RunSearchResultsTest() {
contents_view->GetDefaultContentsBounds();
EXPECT_EQ(AppListModel::STATE_SEARCH_RESULTS,
delegate_->GetTestModel()->state());
- if (test_type_ == EXPERIMENTAL) {
- EXPECT_EQ(default_contents_bounds,
- contents_view->search_results_page_view()->bounds());
- } else {
- EXPECT_EQ(default_contents_bounds,
- contents_view->search_results_list_view()->bounds());
- }
+ EXPECT_EQ(default_contents_bounds,
+ contents_view->search_results_page_view()->bounds());
// Hide the search results.
contents_view->ShowSearchResults(false);
« no previous file with comments | « no previous file | ui/app_list/views/contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698