Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / views / test / apps_grid_view_test_api.cc

diff --git a/src/ui/app_list/views/test/apps_grid_view_test_api.cc b/src/ui/app_list/views/test/apps_grid_view_test_api.cc
index 2251036..1142f11 100644 (file)
--- a/src/ui/app_list/views/test/apps_grid_view_test_api.cc
+++ b/src/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();
 }