Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_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_impl.h"
 
 #include <stddef.h>
 
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf_button.h"
@@ skipping 685 matching lines @@
   AppWindow* window1 = CreateAppWindow(browser()->profile(), extension1);
   EXPECT_TRUE(window1->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1->GetBaseWindow()->IsActive());
 
   // Confirm that a controller item was created and is the correct state.
   const ash::ShelfItem& item1 = GetLastLauncherItem();
   LauncherItemController* item1_controller = GetItemController(item1.id);
   EXPECT_EQ(ash::TYPE_APP, item1.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
   // Since it is already active, clicking it should minimize.
-  TestEvent click_event(ui::ET_MOUSE_PRESSED);
-  item1_controller->ItemSelected(click_event);
+  int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  item1_controller->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                                 ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_FALSE(window1->GetNativeWindow()->IsVisible());
   EXPECT_FALSE(window1->GetBaseWindow()->IsActive());
   EXPECT_TRUE(window1->GetBaseWindow()->IsMinimized());
   EXPECT_EQ(ash::STATUS_RUNNING, item1.status);
   // Clicking the item again should activate the window again.
-  item1_controller->ItemSelected(click_event);
+  item1_controller->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                                 ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(window1->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1->GetBaseWindow()->IsActive());
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
   // Maximizing a window should preserve state after minimize + click.
   window1->GetBaseWindow()->Maximize();
   window1->GetBaseWindow()->Minimize();
-  item1_controller->ItemSelected(click_event);
+  item1_controller->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                                 ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(window1->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1->GetBaseWindow()->IsActive());
   EXPECT_TRUE(window1->GetBaseWindow()->IsMaximized());
   window1->GetBaseWindow()->Restore();
   EXPECT_TRUE(window1->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1->GetBaseWindow()->IsActive());
   EXPECT_FALSE(window1->GetBaseWindow()->IsMaximized());
 
   // Creating a second window of the same type should change the behavior so
   // that a click does not change the activation state.
   AppWindow* window1a = CreateAppWindow(browser()->profile(), extension1);
   EXPECT_TRUE(window1a->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1a->GetBaseWindow()->IsActive());
   // The first click does nothing.
-  item1_controller->ItemSelected(click_event);
+  item1_controller->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                                 ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(window1->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1a->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1->GetBaseWindow()->IsActive());
   EXPECT_FALSE(window1a->GetBaseWindow()->IsActive());
   // The second neither.
-  item1_controller->ItemSelected(click_event);
+  item1_controller->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                                 ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(window1->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1a->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(window1->GetBaseWindow()->IsActive());
   EXPECT_FALSE(window1a->GetBaseWindow()->IsActive());
 }
 
 // Confirm that ash::ShelfWindowWatcher correctly handles app panels.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, AppPanel) {
   // Enable experimental APIs to allow panel creation.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 11 matching lines @@
   // Confirm that an item delegate was created and is in the correct state.
   const ash::ShelfItem& item1 = GetLastLauncherPanelItem();
   EXPECT_EQ(ash::TYPE_APP_PANEL, item1.type);
   EXPECT_EQ(ash::STATUS_RUNNING, item1.status);
   EXPECT_EQ(nullptr, GetItemController(item1.id));
   ash::ShelfItemDelegate* item1_delegate =
       shelf_model()->GetShelfItemDelegate(item1.id);
   EXPECT_EQ(ash::TYPE_APP_PANEL,
             panel->GetNativeWindow()->GetProperty(ash::kShelfItemTypeKey));
   // Click the item and confirm that the panel is activated.
-  TestEvent click_event(ui::ET_MOUSE_PRESSED);
-  item1_delegate->ItemSelected(click_event);
+  int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  item1_delegate->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                               ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(panel->GetBaseWindow()->IsActive());
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
   // Click the item again and confirm that the panel is minimized.
-  item1_delegate->ItemSelected(click_event);
+  item1_delegate->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                               ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(panel->GetBaseWindow()->IsMinimized());
   EXPECT_EQ(ash::STATUS_RUNNING, item1.status);
   // Click the item again and confirm that the panel is activated.
-  item1_delegate->ItemSelected(click_event);
+  item1_delegate->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                               ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(panel->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(panel->GetBaseWindow()->IsActive());
   EXPECT_FALSE(panel->GetBaseWindow()->IsMinimized());
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 }
 
 // Confirm that click behavior for app panels is correct.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, AppPanelClickBehavior) {
   // Enable experimental APIs to allow panel creation.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 11 matching lines @@
   // Confirm that an item delegate was created and is in the correct state.
   const ash::ShelfItem& item1 = GetLastLauncherPanelItem();
   EXPECT_EQ(ash::TYPE_APP_PANEL, item1.type);
   EXPECT_EQ(ash::STATUS_RUNNING, item1.status);
   EXPECT_EQ(nullptr, GetItemController(item1.id));
   ash::ShelfItemDelegate* item1_delegate =
       shelf_model()->GetShelfItemDelegate(item1.id);
   EXPECT_EQ(ash::TYPE_APP_PANEL,
             panel->GetNativeWindow()->GetProperty(ash::kShelfItemTypeKey));
   // Click the item and confirm that the panel is activated.
-  TestEvent click_event(ui::ET_MOUSE_PRESSED);
-  item1_delegate->ItemSelected(click_event);
+  int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  item1_delegate->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                               ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(panel->GetBaseWindow()->IsActive());
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
   // Click the item again and confirm that the panel is minimized.
-  item1_delegate->ItemSelected(click_event);
+  item1_delegate->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                               ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(panel->GetBaseWindow()->IsMinimized());
   EXPECT_EQ(ash::STATUS_RUNNING, item1.status);
   // Click the item again and confirm that the panel is activated.
-  item1_delegate->ItemSelected(click_event);
+  item1_delegate->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE, display_id,
+                               ash::LAUNCH_FROM_UNKNOWN);
   EXPECT_TRUE(panel->GetNativeWindow()->IsVisible());
   EXPECT_TRUE(panel->GetBaseWindow()->IsActive());
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, BrowserActivation) {
   int item_count = shelf_model()->item_count();
 
   // First run app.
   const Extension* extension1 = LoadAndLaunchPlatformApp("launch", "Launched");
@@ skipping 684 matching lines @@
       shelf_model()->GetShelfItemDelegate(item.id);
   EXPECT_NE(nullptr, shelf_item_delegate);
   EXPECT_EQ(ash::TYPE_APP_PANEL, item.type);
   EXPECT_EQ(ash::STATUS_RUNNING, item.status);
 
   // App windows should go to attention state.
   panel->GetNativeWindow()->SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ATTENTION, item.status);
 
   // Click the item and confirm that the panel is activated.
-  TestEvent click_event(ui::ET_MOUSE_PRESSED);
-  EXPECT_EQ(ash::ShelfItemDelegate::kExistingWindowActivated,
-            shelf_item_delegate->ItemSelected(click_event));
+  int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  EXPECT_EQ(
+      ash::kExistingWindowActivated,
+      shelf_item_delegate->ItemSelected(ui::ET_MOUSE_PRESSED, ui::EF_NONE,
+                                        display_id, ash::LAUNCH_FROM_UNKNOWN));
   EXPECT_TRUE(panel->GetBaseWindow()->IsActive());
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 
   // Active windows don't show attention.
   panel->GetNativeWindow()->SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest,
                        ShowInShelfWindowsWithWindowKeySet) {
@@ skipping 194 matching lines @@
   // Check that the LRU browser list does only contain the original browser.
   BrowserList* browser_list = BrowserList::GetInstance();
   BrowserList::const_reverse_iterator it = browser_list->begin_last_active();
   EXPECT_EQ(*it, browser());
   ++it;
   EXPECT_EQ(it, browser_list->end_last_active());
 
   // Now request to either activate an existing app or create a new one.
   LauncherItemController* item_controller =
       controller_->GetLauncherItemController(shortcut_id);
-  item_controller->ItemSelected(ui::KeyEvent(ui::ET_KEY_RELEASED,
-                                        ui::VKEY_RETURN,
-                                        ui::EF_NONE));
+  int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  item_controller->ItemSelected(ui::ET_KEY_RELEASED, ui::EF_NONE, display_id,
+                                ash::LAUNCH_FROM_UNKNOWN);
 
   // Check that we have set focus on the existing application and nothing new
   // was created.
   EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(tab_count1, tab_strip->count());
   EXPECT_EQ(tab_count2, tab_strip2->count());
   EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()),
             browser2);
 }
 
@@ skipping 363 matching lines @@
       controller_->GetBrowserShortcutLauncherItemController();
   const ash::ShelfID id = item_controller->shelf_id();
   EXPECT_NE(ash::kInvalidShelfID, id);
 
   // Get the number of browsers.
   size_t running_browser = chrome::GetTotalBrowserCount();
   EXPECT_EQ(0u, running_browser);
   EXPECT_FALSE(controller_->IsOpen(id));
 
   // Activate. This creates new browser
-  item_controller->Activate(ash::LAUNCH_FROM_UNKNOWN);
+  int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  item_controller->ItemSelected(ui::ET_UNKNOWN, ui::EF_NONE, display_id,
+                                ash::LAUNCH_FROM_UNKNOWN);
   // New Window is created.
   running_browser = chrome::GetTotalBrowserCount();
   EXPECT_EQ(1u, running_browser);
   EXPECT_TRUE(controller_->IsOpen(id));
 
   // Minimize Window.
   ash::wm::WindowState* window_state = ash::wm::GetActiveWindowState();
   window_state->Minimize();
   EXPECT_TRUE(window_state->IsMinimized());
 
-  // Activate again. This doesn't create new browser.
-  // It activates window.
-  item_controller->Activate(ash::LAUNCH_FROM_UNKNOWN);
+  // Activate again. This doesn't create new browser, it activates the window.
+  item_controller->ItemSelected(ui::ET_UNKNOWN, ui::EF_NONE, display_id,
+                                ash::LAUNCH_FROM_UNKNOWN);
   running_browser = chrome::GetTotalBrowserCount();
   EXPECT_EQ(1u, running_browser);
   EXPECT_TRUE(controller_->IsOpen(id));
   EXPECT_FALSE(window_state->IsMinimized());
 }
 
 // Check that the window's ShelfID property matches that of the active tab.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, MatchingShelfIDandActiveTab) {
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
@@ skipping 235 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));
 }