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

Side by Side Diff: ash/test/app_list_controller_test_api.cc

Issue 775553003: Experimental app list: Fixed failing browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@app-list-tests-experimental
Patch Set: Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/test/app_list_controller_test_api.h" 5 #include "ash/test/app_list_controller_test_api.h"
6 6
7 #include "ash/test/shell_test_api.h" 7 #include "ash/test/shell_test_api.h"
8 #include "ash/wm/app_list_controller.h" 8 #include "ash/wm/app_list_controller.h"
9 #include "ui/app_list/views/app_list_main_view.h" 9 #include "ui/app_list/views/app_list_main_view.h"
10 #include "ui/app_list/views/app_list_view.h" 10 #include "ui/app_list/views/app_list_view.h"
11 #include "ui/app_list/views/apps_container_view.h" 11 #include "ui/app_list/views/apps_container_view.h"
12 #include "ui/app_list/views/apps_grid_view.h" 12 #include "ui/app_list/views/apps_grid_view.h"
13 #include "ui/app_list/views/contents_view.h" 13 #include "ui/app_list/views/contents_view.h"
14 #include "ui/app_list/views/start_page_view.h"
14 15
15 namespace ash { 16 namespace ash {
16 namespace test { 17 namespace test {
17 18
18 AppListControllerTestApi::AppListControllerTestApi(Shell* shell) 19 AppListControllerTestApi::AppListControllerTestApi(Shell* shell)
19 : app_list_controller_(ShellTestApi(shell).app_list_controller()) {} 20 : app_list_controller_(ShellTestApi(shell).app_list_controller()) {}
20 21
21 app_list::AppsGridView* AppListControllerTestApi::GetRootGridView() { 22 app_list::AppsGridView* AppListControllerTestApi::GetRootGridView() const {
22 return view()->app_list_main_view()->contents_view()-> 23 return view()->app_list_main_view()->contents_view()->
23 apps_container_view()->apps_grid_view(); 24 apps_container_view()->apps_grid_view();
24 } 25 }
25 26
26 app_list::AppListView* AppListControllerTestApi::view() { 27 app_list::StartPageView* AppListControllerTestApi::GetStartPageView() const {
28 return view()->app_list_main_view()->contents_view()->start_page_view();
29 }
30
31 app_list::AppListView* AppListControllerTestApi::view() const {
27 return app_list_controller_->view_; 32 return app_list_controller_->view_;
28 } 33 }
29 34
35 void AppListControllerTestApi::LayoutContentsView() {
36 view()->app_list_main_view()->contents_view()->Layout();
37 }
38
30 } // namespace test 39 } // namespace test
31 } // namespace ash 40 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698