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

Unified Diff: ui/app_list/apps_grid_view_unittest.cc

Issue 10386224: app_list: Add search box and search result view for v2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win_aura Created 8 years, 7 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
Index: ui/app_list/apps_grid_view_unittest.cc
diff --git a/ui/app_list/app_list_model_view_unittest.cc b/ui/app_list/apps_grid_view_unittest.cc
similarity index 85%
rename from ui/app_list/app_list_model_view_unittest.cc
rename to ui/app_list/apps_grid_view_unittest.cc
index 16cc112aabe3e290fb9287deaf0eaeeb19a917f8..70a330adc79a7b26b028612591e7662bfc9a85e3 100644
--- a/ui/app_list/app_list_model_view_unittest.cc
+++ b/ui/app_list/apps_grid_view_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/app_list/app_list_model_view.h"
+#include "ui/app_list/apps_grid_view.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/app_list/app_list_item_view.h"
@@ -21,7 +21,7 @@ struct ModelViewCalculateLayoutCase {
namespace app_list {
-TEST(AppListModelViewTest, ModelViewCalculateLayout) {
+TEST(AppsGridViewTest, ModelViewCalculateLayout) {
// kMinTitleWidth is the average width of 15 chars of default size 12 font in
// chromeos. Override here to avoid flakiness from different default font on
// bots.
@@ -55,11 +55,11 @@ TEST(AppListModelViewTest, ModelViewCalculateLayout) {
int cols = 0;
gfx::Size content_size(kCases[i].screen_size.width(),
kCases[i].screen_size.height() - kLauncherHeight);
- AppListModelView::CalculateLayout(content_size,
- kCases[i].num_of_tiles,
- &icon_size,
- &rows,
- &cols);
+ AppsGridView::CalculateLayout(content_size,
+ kCases[i].num_of_tiles,
+ &icon_size,
+ &rows,
+ &cols);
EXPECT_EQ(kCases[i].expected_icon_size, icon_size) << "i=" << i;
EXPECT_EQ(kCases[i].expected_rows, rows) << "i=" << i;
EXPECT_EQ(kCases[i].expected_cols, cols) << "i=" << i;

Powered by Google App Engine
This is Rietveld 408576698