| 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 <string> | 
|  | 8 #include <vector> | 
|  | 9 | 
| 7 #include "base/command_line.h" | 10 #include "base/command_line.h" | 
| 8 #include "base/run_loop.h" | 11 #include "base/run_loop.h" | 
| 9 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" | 
| 10 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" | 
| 11 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" | 
| 12 #include "ui/app_list/app_list_switches.h" | 15 #include "ui/app_list/app_list_switches.h" | 
| 13 #include "ui/app_list/pagination_model.h" | 16 #include "ui/app_list/pagination_model.h" | 
| 14 #include "ui/app_list/search_box_model.h" | 17 #include "ui/app_list/search_box_model.h" | 
| 15 #include "ui/app_list/test/app_list_test_model.h" | 18 #include "ui/app_list/test/app_list_test_model.h" | 
| 16 #include "ui/app_list/test/app_list_test_view_delegate.h" | 19 #include "ui/app_list/test/app_list_test_view_delegate.h" | 
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 816 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance, | 819 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance, | 
| 817                         AppListViewTestAura, | 820                         AppListViewTestAura, | 
| 818                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 821                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 
| 819 | 822 | 
| 820 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, | 823 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, | 
| 821                         AppListViewTestDesktop, | 824                         AppListViewTestDesktop, | 
| 822                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 825                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 
| 823 | 826 | 
| 824 }  // namespace test | 827 }  // namespace test | 
| 825 }  // namespace app_list | 828 }  // namespace app_list | 
| OLD | NEW | 
|---|