| Index: ui/app_list/shower/test/app_list_shower_impl_test_api.h
|
| diff --git a/ash/test/app_list_controller_test_api.h b/ui/app_list/shower/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/shower/test/app_list_shower_impl_test_api.h
|
| index b0fadc368d5eeab95dd5aad2118c0e5a99d0c2af..8f5958745afa5ade2f1f93634b075fe7ecc13be6 100644
|
| --- a/ash/test/app_list_controller_test_api.h
|
| +++ b/ui/app_list/shower/test/app_list_shower_impl_test_api.h
|
| @@ -2,46 +2,33 @@
|
| // 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_SHOWER_TEST_APP_LIST_SHOWER_IMPL_TEST_API_H_
|
| +#define UI_APP_LIST_SHOWER_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.
|
| -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* const 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_SHOWER_TEST_APP_LIST_SHOWER_IMPL_TEST_API_H_
|
|
|