Make cancelling of app list correctly clean up folder UI.

ui/app_list/views/apps_grid_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/apps_grid_view.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/views/app_list_item_view.h"
+#include "ui/app_list/views/apps_grid_view_folder_delegate.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace app_list {
 namespace test {
 
 namespace {
 
 const int kIconDimension = 48;
 const int kCols = 2;
@@ skipping 139 matching lines @@
 
   scoped_ptr<AppListTestModel> model_;
   scoped_ptr<PaginationModel> pagination_model_;
   scoped_ptr<AppsGridView> apps_grid_view_;
   scoped_ptr<AppsGridViewTestApi> test_api_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsGridViewTest);
 };
 
+class TestAppsGridViewFolderDelegate : public AppsGridViewFolderDelegate {
+ public:
+  TestAppsGridViewFolderDelegate() : show_bubble_(false) {}
+  ~TestAppsGridViewFolderDelegate() {}
+
+  // Overridden from AppsGridViewFolderDelegate:
+  virtual void UpdateFolderViewBackground(bool show_bubble) OVERRIDE {
+    show_bubble_ = show_bubble;
+  }
+
+  virtual void ReparentItem(AppListItemView* original_drag_view,
+                            const gfx::Point& drag_point_in_folder_grid)
+      OVERRIDE {}

[tapted, 2014/03/26 02:53:54]

nit: OVERRIDE looks lonely, unless clang-format disagrees.

[calamity, 2014/03/27 05:14:44]

All hail our benevolent clang-format overlord.

+
+  virtual void DispatchDragEventForReparent(AppsGridView::Pointer pointer,
+                                            const ui::LocatedEvent& event)
+      OVERRIDE {}
+
+  virtual void DispatchEndDragEventForReparent(
+      bool events_forwarded_to_drag_drop_host) OVERRIDE {}
+
+  virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point)
+      OVERRIDE {
+    return false;
+  }
+
+  bool show_bubble() { return show_bubble_; }
+
+ private:
+  bool show_bubble_;
+};

[tapted, 2014/03/26 02:53:54]

nit: DISALLOW_COPY_AND_ASSIGN(..)

[calamity, 2014/03/27 05:14:44]

Done.

+
 TEST_F(AppsGridViewTest, CreatePage) {
   // Fully populates a page.
   const int kPages = 1;
   model_->PopulateApps(kPages * kTilesPerPage);
   EXPECT_EQ(kPages, pagination_model_->total_pages());
 
   // Adds one more and gets a new page created.
   model_->CreateAndAddItem("Extra");
   EXPECT_EQ(kPages + 1, pagination_model_->total_pages());
 }
@@ skipping 153 matching lines @@
   // Starts a touch drag first then a mouse drag.
   SimulateDrag(AppsGridView::TOUCH, touch_from, touch_to);
   SimulateDrag(AppsGridView::MOUSE, mouse_from, mouse_to);
   // Finishes the drag and touch drag wins.
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(std::string("Item 1,Item 0,Item 3,Item 2"),
             model_->GetModelContent());
   test_api_->LayoutToIdealBounds();
 }
 
+TEST_F(AppsGridViewTest, UpdateFolderBackgroundOnCancelDrag) {
+  const int kTotalItems = 4;
+  TestAppsGridViewFolderDelegate folder_delegate;
+  apps_grid_view_->set_folder_delegate(&folder_delegate);
+  model_->PopulateApps(kTotalItems);
+  EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
+            model_->GetModelContent());
+
+  gfx::Point mouse_from = GetItemTileRectAt(0, 0).CenterPoint();
+  gfx::Point mouse_to = GetItemTileRectAt(0, 1).CenterPoint();
+
+  // Starts a mouse drag and then cancels it.
+  SimulateDrag(AppsGridView::MOUSE, mouse_from, mouse_to);
+  EXPECT_TRUE(folder_delegate.show_bubble());
+  apps_grid_view_->EndDrag(true);
+  EXPECT_FALSE(folder_delegate.show_bubble());
+  EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
+            model_->GetModelContent());
+}
+
 TEST_F(AppsGridViewTest, HighlightWithKeyboard) {
   const int kPages = 3;
   const int kItems = (kPages - 1) * kTilesPerPage + 1;
   model_->PopulateApps(kItems);
 
   const int first_index = 0;
   const int last_index = kItems - 1;
   const int last_index_on_page1_first_row = kRows - 1;
   const int last_index_on_page1 = kTilesPerPage - 1;
   const int first_index_on_page2 = kTilesPerPage;
@@ skipping 96 matching lines @@
   AppListItemView* item_view = GetItemViewAt(0);
   ASSERT_TRUE(item_view);
   const views::Label* title_label = item_view->title();
   EXPECT_FALSE(title_label->GetTooltipText(
       title_label->bounds().CenterPoint(), &actual_tooltip));
   EXPECT_EQ(title, base::UTF16ToUTF8(title_label->text()));
 }
 
 }  // namespace test
 }  // namespace app_list