Make launching apps from shelf more intuitive

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 909 matching lines @@
   EXPECT_EQ(++tab_count, tab_strip->count());
   EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut_id)).status);
   WebContents* tab = tab_strip->GetActiveWebContents();
   content::WebContentsDestroyedWatcher destroyed_watcher(tab);
   browser()->tab_strip_model()->CloseSelectedTabs();
   destroyed_watcher.Wait();
   EXPECT_EQ(--tab_count, tab_strip->count());
   EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status);
 }
 
+// Tests behavior of launching app from shelf in the first display while the
+// second display has the focus. Initially, Browsers exists in the first
+// display.
+IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchAppFromDisplayWithoutFocus0) {
+  // Updates the display configuration to add a secondary display.
+  display::DisplayManager* display_manager =
+      ash::Shell::Get()->display_manager();
+  display::test::DisplayManagerTestApi(display_manager)
+      .UpdateDisplay("0+0-800x800,801+0-800x800");
+  display::Displays displays = display_manager->active_display_list();
+  aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
+  EXPECT_EQ(displays.size(), 2U);
+  EXPECT_EQ(roots.size(), 2U);
+  EXPECT_EQ(
+      displays[0].id(),
+      display::Screen::GetScreen()->GetDisplayNearestWindow(roots[0]).id());
+  EXPECT_EQ(
+      displays[1].id(),
+      display::Screen::GetScreen()->GetDisplayNearestWindow(roots[1]).id());
+
+  // Ensures that display 0 has one browser with focus and display 1 has two
+  // browsers. Each browser only has one tab.
+  BrowserList* browser_list = BrowserList::GetInstance();
+  Browser* browser0 = browser();
+  Browser* browser1 = CreateBrowser(browser()->profile());
+  Browser* browser2 = CreateBrowser(browser()->profile());
+  browser0->window()->SetBounds(displays[0].work_area());
+  browser1->window()->SetBounds(displays[1].work_area());
+  browser2->window()->SetBounds(displays[1].work_area());
+  // Ensures browser 2 is above browser 1 in display 1.
+  browser_list->SetLastActive(browser2);
+  browser_list->SetLastActive(browser0);
+  EXPECT_EQ(browser_list->size(), 3U);
+  EXPECT_EQ(browser0->window()->GetNativeWindow()->GetRootWindow(), roots[0]);
+  EXPECT_EQ(browser1->window()->GetNativeWindow()->GetRootWindow(), roots[1]);
+  EXPECT_EQ(browser2->window()->GetNativeWindow()->GetRootWindow(), roots[1]);
+  EXPECT_EQ(browser0->tab_strip_model()->count(), 1);
+  EXPECT_EQ(browser1->tab_strip_model()->count(), 1);
+  EXPECT_EQ(browser2->tab_strip_model()->count(), 1);
+
+  // Launches an app from the shelf of display 0 and expects a new tab is opened
+  // in the uppermost browser in display 0.
+  ash::ShelfID shortcut_id = CreateShortcut("app1");
+  WmShelf::ActivateShelfItemInDisplay(model_->ItemIndexByID(shortcut_id),
+                                      displays[1].id());
+  EXPECT_EQ(browser0->tab_strip_model()->count(), 1);
+  EXPECT_EQ(browser1->tab_strip_model()->count(), 1);
+  EXPECT_EQ(browser2->tab_strip_model()->count(), 2);
+}
+
+// Tests behavior of launching app from shelf in the first display while the
+// second display has the focus. Initially, No browser exists in the first
+// display.
+IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchAppFromDisplayWithoutFocus1) {
+  // Updates the display configuration to add a secondary display.
+  display::DisplayManager* display_manager =
+      ash::Shell::Get()->display_manager();
+  display::test::DisplayManagerTestApi(display_manager)
+      .UpdateDisplay("800x800,801+0-800x800");
+  display::Displays displays = display_manager->active_display_list();
+  aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
+  EXPECT_EQ(displays.size(), 2U);
+  EXPECT_EQ(roots.size(), 2U);
+  EXPECT_EQ(
+      displays[0].id(),
+      display::Screen::GetScreen()->GetDisplayNearestWindow(roots[0]).id());
+  EXPECT_EQ(
+      displays[1].id(),
+      display::Screen::GetScreen()->GetDisplayNearestWindow(roots[1]).id());
+
+  // Ensures that display 0 has one browser with focus and display 1 has no
+  // browser. The browser only has one tab.
+  BrowserList* browser_list = BrowserList::GetInstance();
+  Browser* browser0 = browser();
+  browser0->window()->SetBounds(displays[0].work_area());
+  EXPECT_EQ(browser_list->size(), 1U);
+  EXPECT_EQ(browser0->window()->GetNativeWindow()->GetRootWindow(), roots[0]);
+  EXPECT_EQ(browser0->tab_strip_model()->count(), 1);
+
+  // Launches an app from the shelf of display 0 and expects a new browser with
+  // one tab is opened in display 0.
+  ash::ShelfID shortcut_id = CreateShortcut("app1");
+  WmShelf::ActivateShelfItemInDisplay(model_->ItemIndexByID(shortcut_id),
+                                      displays[1].id());
+  Browser* browser1 = browser_list->GetLastActive();
+  EXPECT_EQ(browser_list->size(), 2U);
+  EXPECT_NE(browser1, browser0);
+  EXPECT_EQ(browser0->tab_strip_model()->count(), 1);
+  EXPECT_EQ(browser1->tab_strip_model()->count(), 1);
+}
+
 // Launch the app first and then create the shortcut.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchUnpinned) {
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count = tab_strip->count();
   LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
                          WindowOpenDisposition::NEW_FOREGROUND_TAB);
   EXPECT_EQ(++tab_count, tab_strip->count());
   ash::ShelfID shortcut_id = CreateShortcut("app1");
   EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut_id)).status);
   WebContents* tab = tab_strip->GetActiveWebContents();
   content::WebContentsDestroyedWatcher destroyed_watcher(tab);
   browser()->tab_strip_model()->CloseSelectedTabs();
   destroyed_watcher.Wait();
   EXPECT_EQ(--tab_count, tab_strip->count());
   EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status);
 }
 
 // Launches an app in the background and then tries to open it. This is test for
 // a crash we had.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchInBackground) {
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count = tab_strip->count();
   LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
                          WindowOpenDisposition::NEW_BACKGROUND_TAB);
   EXPECT_EQ(++tab_count, tab_strip->count());
   controller_->LaunchApp(ash::ShelfID(last_loaded_extension_id()),
-                         ash::LAUNCH_FROM_UNKNOWN, 0);
+                         ash::LAUNCH_FROM_UNKNOWN, 0, NULL);

[stevenjb, 2017/05/22 17:55:29]

Use nullptr throughout.

 }
 
 // Confirm that clicking a icon for an app running in one of 2 maxmized windows
 // activates the right window.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchMaximized) {
   aura::Window* window1 = browser()->window()->GetNativeWindow();
   ash::wm::WindowState* window1_state = ash::wm::GetWindowState(window1);
   window1_state->Maximize();
   content::WindowedNotificationObserver open_observer(
       chrome::NOTIFICATION_BROWSER_WINDOW_READY,
@@ skipping 30 matching lines @@
   EXPECT_EQ(++tab_count, tab_strip->count());
   controller_->ActivateApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);
   EXPECT_EQ(tab_count, tab_strip->count());
 }
 
 // Launching the same app multiple times should launch a copy for each call.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchApp) {
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count = tab_strip->count();
   ash::ShelfID id(LoadExtension(test_data_dir_.AppendASCII("app1"))->id());
-  controller_->LaunchApp(id, ash::LAUNCH_FROM_UNKNOWN, 0);
+  controller_->LaunchApp(id, ash::LAUNCH_FROM_UNKNOWN, 0, NULL);
   EXPECT_EQ(++tab_count, tab_strip->count());
-  controller_->LaunchApp(id, ash::LAUNCH_FROM_UNKNOWN, 0);
+  controller_->LaunchApp(id, ash::LAUNCH_FROM_UNKNOWN, 0, NULL);
   EXPECT_EQ(++tab_count, tab_strip->count());
 }
 
 // Launch 2 apps and toggle which is active.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, MultipleApps) {
   int item_count = model_->item_count();
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count = tab_strip->count();
   ash::ShelfID shortcut1 = CreateShortcut("app1");
   EXPECT_EQ(++item_count, model_->item_count());
@@ skipping 1385 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));
 }