Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Unified Diff: ui/app_list/views/test/apps_grid_view_test_api.cc

Issue 344793005: Fix flaky AppsGridViewTest on valgrind bot (Strike 2). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/test/apps_grid_view_test_api.cc
diff --git a/ui/app_list/views/test/apps_grid_view_test_api.cc b/ui/app_list/views/test/apps_grid_view_test_api.cc
index b2a49bec83e9cdf619030ba60ac34b42de96398d..01c6feaa07ec153c4b0af7fc0ba1bc753a73c8f2 100644
--- a/ui/app_list/views/test/apps_grid_view_test_api.cc
+++ b/ui/app_list/views/test/apps_grid_view_test_api.cc
@@ -46,7 +46,8 @@ void AppsGridViewTestApi::DisableSynchronousDrag() {
}
bool AppsGridViewTestApi::HasPendingPageFlip() const {
- return view_->page_flip_timer_.IsRunning();
+ return view_->page_flip_timer_.IsRunning() ||
+ view_->pagination_model()->has_transition();
}
} // namespace test
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698