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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

Issue 27777002: Implement app list folder management page UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 7 years, 2 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: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index 2006aa1c9b4966429feadeaf9e2d7ef27adad6ad..9a79bcdec0e03d2c9becbac6c7a991d1a95d2f0a 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -15,6 +15,7 @@
#include "ash/shelf/shelf_util.h"
#include "ash/shelf/shelf_view.h"
#include "ash/shell.h"
+#include "ash/test/app_list_controller_test_api.h"
#include "ash/test/launcher_test_api.h"
#include "ash/test/shelf_view_test_api.h"
#include "ash/test/shell_test_api.h"
@@ -1563,7 +1564,8 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, DragAndDrop) {
EXPECT_TRUE(service->IsAppListVisible());
app_list::AppsGridView* grid_view =
- app_list::AppsGridView::GetLastGridViewForTest();
+ ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
+ GetRootGridView();
ASSERT_TRUE(grid_view);
ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test());
@@ -1779,7 +1781,8 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, ClickItem) {
EXPECT_TRUE(service->IsAppListVisible());
app_list::AppsGridView* grid_view =
- app_list::AppsGridView::GetLastGridViewForTest();
+ ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
+ GetRootGridView();
ASSERT_TRUE(grid_view);
const views::ViewModel* vm_grid = grid_view->view_model_for_test();
EXPECT_EQ(2, vm_grid->view_size());

Powered by Google App Engine
This is Rietveld 408576698