Chromium Code Reviews| Index: ui/app_list/views/app_list_main_view_unittest.cc |
| diff --git a/ui/app_list/views/app_list_main_view_unittest.cc b/ui/app_list/views/app_list_main_view_unittest.cc |
| index b8307618d0d4919af2e5e9b1628245fb9afbf1cd..8fbf58436db21d1901acf3233b4d862197c7ee4b 100644 |
| --- a/ui/app_list/views/app_list_main_view_unittest.cc |
| +++ b/ui/app_list/views/app_list_main_view_unittest.cc |
| @@ -154,14 +154,14 @@ class AppListMainViewTest : public views::ViewsTestBase { |
| grid_view->UpdateDragFromItem(pointer, drag_event); |
| } |
| - ContentsView* ContentsView() { return main_view_->contents_view(); } |
| + ContentsView* contents_view() { return main_view_->contents_view(); } |
| AppsGridView* RootGridView() { |
| - return ContentsView()->apps_container_view()->apps_grid_view(); |
| + return contents_view()->apps_container_view()->apps_grid_view(); |
| } |
| AppListFolderView* FolderView() { |
| - return ContentsView()->apps_container_view()->app_list_folder_view(); |
| + return contents_view()->apps_container_view()->app_list_folder_view(); |
| } |
| AppsGridView* FolderGridView() { return FolderView()->items_grid_view(); } |
| @@ -298,10 +298,10 @@ TEST_F(AppListMainViewTest, DragReparentItemOntoPageSwitcher) { |
| const int kNumApps = 30; |
| // Ensure we are on the apps grid view page. |
| - app_list::ContentsView* contents_view = ContentsView(); |
| - contents_view->SetActivePage( |
| - contents_view->GetPageIndexForState(AppListModel::STATE_APPS)); |
| - contents_view->Layout(); |
| + app_list::ContentsView* contents_view_ptr = contents_view(); |
|
Matt Giuca
2014/12/02 06:13:18
I don't like the name "contents_view_ptr". It's un
|
| + contents_view_ptr->SetActivePage( |
| + contents_view_ptr->GetPageIndexForState(AppListModel::STATE_APPS)); |
| + contents_view_ptr->Layout(); |
| AppListItemView* folder_item_view = CreateAndOpenSingleItemFolder(); |
| const gfx::Rect first_slot_tile = folder_item_view->bounds(); |