[Merge M60] Fix shelf dragging context in case Context Menu is shown.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <stddef.h>
 
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/window_properties.h"
@@ skipping 2063 matching lines @@
   // overflow button).
   EXPECT_EQ(total_count - 1, model_->item_count());
   EXPECT_TRUE(test.IsOverflowButtonVisible());
 
   // Rip off again and the overflow button should has disappeared.
   RipOffItemIndex(app_index, &generator, &test, RIP_OFF_ITEM);
   EXPECT_EQ(total_count - 2, model_->item_count());
   EXPECT_FALSE(test.IsOverflowButtonVisible());
 }
 
+// Validates that context menu is shown on right click and drag context is not
+// set in this case and set on left click.
+IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ShelfButtonContextMenu) {
+  ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow(),
+                                     gfx::Point());
+  ash::test::ShelfViewTestAPI test(shelf_->GetShelfViewForTesting());
+  const int browser_index = GetIndexOfShelfItemType(ash::TYPE_BROWSER_SHORTCUT);
+  ASSERT_LE(0, browser_index);
+  ash::ShelfButton* button = test.GetButton(browser_index);
+  ASSERT_TRUE(button);
+
+  // No context menu is shown at this time.
+  EXPECT_FALSE(test.shelf_view()->IsShowingMenu());
+  const gfx::Rect bounds = button->GetBoundsInScreen();
+  generator.MoveMouseTo(bounds.CenterPoint().x(), bounds.CenterPoint().y());
+  generator.PressRightButton();
+  // Context menu is shown on right button press and no drag context is set.
+  EXPECT_TRUE(test.shelf_view()->IsShowingMenu());
+  EXPECT_FALSE(test.shelf_view()->drag_view());
+  generator.ReleaseRightButton();
+  EXPECT_FALSE(test.shelf_view()->drag_view());
+
+  // Press left button. Menu should close and drag context is set to |button|.
+  generator.PressLeftButton();
+  EXPECT_FALSE(test.shelf_view()->IsShowingMenu());
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(test.shelf_view()->drag_view(), button);
+  generator.ReleaseLeftButton();
+  EXPECT_FALSE(test.shelf_view()->drag_view());
+}
+
 // Check that clicking on an app shelf item launches a new browser.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ClickItem) {
   // Get a number of interfaces we need.
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow(),
                                      gfx::Point());
   ash::test::ShelfViewTestAPI test(shelf_->GetShelfViewForTesting());
   AppListService* service = AppListService::Get();
   // There should be two items in our shelf by this time.
   EXPECT_EQ(2, model_->item_count());
   EXPECT_FALSE(service->IsAppListVisible());
@@ skipping 307 matching lines @@
 
   // Close all windows via the menu item.
   CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
   EXPECT_EQ(0u, BrowserList::GetInstance()->size());
 
   // Check if "Close" is removed from the context menu.
   std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
   ASSERT_FALSE(
       IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
 }