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

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

Issue 614213004: Refactor app list max folder logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 225103644288907b28a31f2805b40b02deff480d..1142f113d645363c43a040bc9c9ae2b40e1966da 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
@@ -23,6 +23,14 @@ views::View* AppsGridViewTestApi::GetViewAtModelIndex(int index) const {
}
void AppsGridViewTestApi::LayoutToIdealBounds() {
+ if (view_->reorder_timer_.IsRunning()) {
+ view_->reorder_timer_.Stop();
+ view_->OnReorderTimer();
+ }
+ if (view_->folder_dropping_timer_.IsRunning()) {
+ view_->folder_dropping_timer_.Stop();
+ view_->OnFolderDroppingTimer();
+ }
view_->bounds_animator_.Cancel();
view_->Layout();
}
« ui/app_list/views/apps_grid_view.cc ('K') | « ui/app_list/views/apps_grid_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698