| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/app_list/views/app_list_view.h" | 5 #include "ui/app_list/views/app_list_view.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 #include "ui/app_list/app_list_switches.h" | 12 #include "ui/app_list/app_list_switches.h" |
| 13 #include "ui/app_list/pagination_model.h" | 13 #include "ui/app_list/pagination_model.h" |
| 14 #include "ui/app_list/search_box_model.h" | 14 #include "ui/app_list/search_box_model.h" |
| 15 #include "ui/app_list/test/app_list_test_model.h" | 15 #include "ui/app_list/test/app_list_test_model.h" |
| 16 #include "ui/app_list/test/app_list_test_view_delegate.h" | 16 #include "ui/app_list/test/app_list_test_view_delegate.h" |
| 17 #include "ui/app_list/test/test_search_result.h" |
| 17 #include "ui/app_list/views/app_list_folder_view.h" | 18 #include "ui/app_list/views/app_list_folder_view.h" |
| 18 #include "ui/app_list/views/app_list_main_view.h" | 19 #include "ui/app_list/views/app_list_main_view.h" |
| 19 #include "ui/app_list/views/apps_container_view.h" | 20 #include "ui/app_list/views/apps_container_view.h" |
| 20 #include "ui/app_list/views/apps_grid_view.h" | 21 #include "ui/app_list/views/apps_grid_view.h" |
| 21 #include "ui/app_list/views/contents_switcher_view.h" | 22 #include "ui/app_list/views/contents_switcher_view.h" |
| 22 #include "ui/app_list/views/contents_view.h" | 23 #include "ui/app_list/views/contents_view.h" |
| 23 #include "ui/app_list/views/search_box_view.h" | 24 #include "ui/app_list/views/search_box_view.h" |
| 24 #include "ui/app_list/views/search_result_list_view.h" | 25 #include "ui/app_list/views/search_result_list_view.h" |
| 25 #include "ui/app_list/views/start_page_view.h" | 26 #include "ui/app_list/views/start_page_view.h" |
| 26 #include "ui/app_list/views/test/apps_grid_view_test_api.h" | 27 #include "ui/app_list/views/test/apps_grid_view_test_api.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 54 ++it) { | 55 ++it) { |
| 55 if ((*it)->visible()) | 56 if ((*it)->visible()) |
| 56 count++; | 57 count++; |
| 57 } | 58 } |
| 58 return count; | 59 return count; |
| 59 } | 60 } |
| 60 | 61 |
| 61 // Choose a set that is 3 regular app list pages and 2 landscape app list pages. | 62 // Choose a set that is 3 regular app list pages and 2 landscape app list pages. |
| 62 const int kInitialItems = 34; | 63 const int kInitialItems = 34; |
| 63 | 64 |
| 64 class TestTileSearchResult : public SearchResult { | 65 class TestTileSearchResult : public TestSearchResult { |
| 65 public: | 66 public: |
| 66 TestTileSearchResult() { set_display_type(DISPLAY_TILE); } | 67 TestTileSearchResult() { set_display_type(DISPLAY_TILE); } |
| 67 virtual ~TestTileSearchResult() {} | 68 virtual ~TestTileSearchResult() {} |
| 68 | 69 |
| 69 private: | 70 private: |
| 70 DISALLOW_COPY_AND_ASSIGN(TestTileSearchResult); | 71 DISALLOW_COPY_AND_ASSIGN(TestTileSearchResult); |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 // Allows the same tests to run with different contexts: either an Ash-style | 74 // Allows the same tests to run with different contexts: either an Ash-style |
| 74 // root window or a desktop window tree host. | 75 // root window or a desktop window tree host. |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance, | 709 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance, |
| 709 AppListViewTestAura, | 710 AppListViewTestAura, |
| 710 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 711 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); |
| 711 | 712 |
| 712 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, | 713 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, |
| 713 AppListViewTestDesktop, | 714 AppListViewTestDesktop, |
| 714 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 715 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); |
| 715 | 716 |
| 716 } // namespace test | 717 } // namespace test |
| 717 } // namespace app_list | 718 } // namespace app_list |
| OLD | NEW |