Chromium Code Reviews| Index: ui/app_list/test/app_list_shower_impl_test_api.h |
| diff --git a/ash/test/app_list_controller_test_api.h b/ui/app_list/test/app_list_shower_impl_test_api.h |
| similarity index 32% |
| copy from ash/test/app_list_controller_test_api.h |
| copy to ui/app_list/test/app_list_shower_impl_test_api.h |
| index b0fadc368d5eeab95dd5aad2118c0e5a99d0c2af..3d566753d417994e0e173ce4ed501456f3cb2bab 100644 |
| --- a/ash/test/app_list_controller_test_api.h |
| +++ b/ui/app_list/test/app_list_shower_impl_test_api.h |
| @@ -2,46 +2,32 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef ASH_TEST_APP_LIST_CONTROLLER_TEST_API_H_ |
| -#define ASH_TEST_APP_LIST_CONTROLLER_TEST_API_H_ |
| +#ifndef UI_APP_LIST_TEST_APP_LIST_SHOWER_IMPL_TEST_API_H_ |
| +#define UI_APP_LIST_TEST_APP_LIST_SHOWER_IMPL_TEST_API_H_ |
| #include "base/macros.h" |
| namespace app_list { |
| +class AppListShowerDelegate; |
| +class AppListShowerImpl; |
| class AppListView; |
| -class AppsGridView; |
| -class StartPageView; |
| -} |
| - |
| -namespace ash { |
| -class AppListController; |
| -class Shell; |
| namespace test { |
| - |
| // Accesses private data from an AppListController for testing. |
|
xiyuan
2016/03/24 20:31:12
nit: insert an empty line before.
mfomitchev
2016/03/29 17:33:32
Done.
|
| -class AppListControllerTestApi { |
| +class AppListShowerImplTestApi { |
| public: |
| - explicit AppListControllerTestApi(Shell* shell); |
| - |
| - // Gets the root level apps grid view. |
| - app_list::AppsGridView* GetRootGridView() const; |
| - |
| - // Gets the start page view. |
| - app_list::StartPageView* GetStartPageView() const; |
| - |
| - app_list::AppListView* view() const; |
| + explicit AppListShowerImplTestApi(AppListShowerImpl* shower); |
| - // Calls Layout() on the ContentsView. |
| - void LayoutContentsView(); |
| + AppListView* view(); |
| + AppListShowerDelegate* shower_delegate(); |
| private: |
| - AppListController* app_list_controller_; // Not owned. |
| + AppListShowerImpl* shower_; |
| - DISALLOW_COPY_AND_ASSIGN(AppListControllerTestApi); |
| + DISALLOW_COPY_AND_ASSIGN(AppListShowerImplTestApi); |
| }; |
| } // namespace test |
| -} // namespace ash |
| +} // namespace app_list |
| -#endif // ASH_TEST_APP_LIST_CONTROLLER_TEST_API_H_ |
| +#endif // UI_APP_LIST_TEST_APP_LIST_SHOWER_IMPL_TEST_API_H_ |