| 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> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 case NORMAL: | 302 case NORMAL: |
| 303 EXPECT_EQ("400x500", view_->bounds().size().ToString()); | 303 EXPECT_EQ("400x500", view_->bounds().size().ToString()); |
| 304 break; | 304 break; |
| 305 case LANDSCAPE: | 305 case LANDSCAPE: |
| 306 // NOTE: Height should not exceed 402, because otherwise there might not | 306 // NOTE: Height should not exceed 402, because otherwise there might not |
| 307 // be enough space to accomodate the virtual keyboard. (LANDSCAPE mode is | 307 // be enough space to accomodate the virtual keyboard. (LANDSCAPE mode is |
| 308 // enabled by default when the virtual keyboard is enabled.) | 308 // enabled by default when the virtual keyboard is enabled.) |
| 309 EXPECT_EQ("576x402", view_->bounds().size().ToString()); | 309 EXPECT_EQ("576x402", view_->bounds().size().ToString()); |
| 310 break; | 310 break; |
| 311 case EXPERIMENTAL: | 311 case EXPERIMENTAL: |
| 312 // TODO(calamity): This should be 768x560, to match the most recent mocks. | 312 EXPECT_EQ("768x570", view_->bounds().size().ToString()); |
| 313 EXPECT_EQ("768x577", view_->bounds().size().ToString()); | |
| 314 break; | 313 break; |
| 315 default: | 314 default: |
| 316 NOTREACHED(); | 315 NOTREACHED(); |
| 317 break; | 316 break; |
| 318 } | 317 } |
| 319 | 318 |
| 320 if (is_landscape()) | 319 if (is_landscape()) |
| 321 EXPECT_EQ(2, GetPaginationModel()->total_pages()); | 320 EXPECT_EQ(2, GetPaginationModel()->total_pages()); |
| 322 else | 321 else |
| 323 EXPECT_EQ(3, GetPaginationModel()->total_pages()); | 322 EXPECT_EQ(3, GetPaginationModel()->total_pages()); |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 828 AppListViewTestAura, | 827 AppListViewTestAura, |
| 829 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 828 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); |
| 830 #endif | 829 #endif |
| 831 | 830 |
| 832 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, | 831 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, |
| 833 AppListViewTestDesktop, | 832 AppListViewTestDesktop, |
| 834 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); | 833 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); |
| 835 | 834 |
| 836 } // namespace test | 835 } // namespace test |
| 837 } // namespace app_list | 836 } // namespace app_list |
| OLD | NEW |