Enhance chrome.app.window API with better shelf integration

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/ash_switches.h"
 #include "ash/common/shelf/shelf_constants.h"
@@ skipping 1512 matching lines @@
   TestEvent click_event(ui::ET_MOUSE_PRESSED);
   item_controller->ItemSelected(click_event);
   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, ShowInShelfWindows) {
+  ash::ShelfModel* shelf_model = ash::Shell::GetInstance()->shelf_model();
+
+  //Tests without window_key parameter set
+
+  // Add a window with shelf True, close it
+  int item_count = shelf_model->item_count();
+  const Extension* extension = LoadAndLaunchPlatformApp("launch", "Launched");
+  AppWindow::CreateParams params;
+  params.show_in_shelf = true;
+  AppWindow* window1 =
+      CreateAppWindowFromParams(browser()->profile(), extension, params);
+  // There should be only 1 item added to the shelf.
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window1);
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+  // Add a window with false, following one with true
+  item_count = shelf_model->item_count();
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+
+  params.show_in_shelf = false;
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  params.show_in_shelf = true;
+  AppWindow* window2 =
+      CreateAppWindowFromParams(browser()->profile(), extension, params);
+  // There should be 2 items added to the shelf: although window1 has
+  // show_in_shelf set to false, it's the first window created so its icon must
+  // show up in shelf.
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  CloseAppWindow(window1);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window2);
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+  // Open just one window with false
+  item_count = shelf_model->item_count();
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+
+  params.show_in_shelf = false;
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  // There should be 1 item added to the shelf: although show_in_shelf is false,
+  // this is the first window created.
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window1);
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+  // Add a window with true, following one with false
+  item_count = shelf_model->item_count();
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+
+  params.show_in_shelf = true;
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count()); // main window
+  params.show_in_shelf = false;
+  window2 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  CloseAppWindow(window1);
+  // There should be 1 item added to the shelf as the second window
+  // is set to show_in_shelf false
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window2);
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+  // Test closing windows in different order
+  item_count = shelf_model->item_count();
+
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+  params.show_in_shelf = false;
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  params.show_in_shelf = false;
+  window2 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  params.show_in_shelf = true;
+  AppWindow* window3 =
+      CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  params.show_in_shelf = true;
+  AppWindow* window4 =
+      CreateAppWindowFromParams(browser()->profile(), extension, params);
+  // There should be 3 items added to the shelf.
+  EXPECT_EQ(item_count + 3, shelf_model->item_count());
+  // Any window close order should be valid
+  CloseAppWindow(window4);
+  // Closed window4 that was shown in shelf. item_count would decrease
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  CloseAppWindow(window1);
+  // Closed window1 which was grouped together with window2 so item_count
+  // would not decrease
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  CloseAppWindow(window3);
+  // Closed window3 that was shown in shelf. item_count would decrease
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window2);
+  // Closed window2 - there is no other window in that group and item_count
+  // would decrease
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+
+  //Tests with window_key parameter set
+
+  // Add a window with shelf True, close it
+  item_count = shelf_model->item_count();
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+  params.show_in_shelf = true;
+  params.window_key = "window1";
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  // There should be only 1 item added to the shelf.
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window1);
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+  // Add a window with false, following one with true
+  item_count = shelf_model->item_count();
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+
+  params.show_in_shelf = false;
+  params.window_key = "window1";
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  params.show_in_shelf = true;
+  params.window_key = "window2";
+  window2 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  // There should be 2 items added to the shelf: although window1 has
+  // show_in_shelf set to false, it's the first window created so its icon must
+  // show up in shelf.
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  CloseAppWindow(window1);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window2);
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+  // Open just one window with false
+  item_count = shelf_model->item_count();
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+
+  params.show_in_shelf = false;
+  params.window_key = "window1";
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  // There should be 1 item added to the shelf: although show_in_shelf is false,
+  // this is the first window created.
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window1);
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+  // Add a window with true, following one with false
+  item_count = shelf_model->item_count();
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+
+  params.show_in_shelf = true;
+  params.window_key = "window1";
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count()); // main window
+  params.show_in_shelf = false;
+  params.window_key = "window2";
+  window2 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  CloseAppWindow(window1);
+  // There should be 1 item added to the shelf as the second window
+  // is set to show_in_shelf false
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window2);
+  EXPECT_EQ(item_count, shelf_model->item_count());
+
+  // Test closing windows in different order
+  item_count = shelf_model->item_count();
+
+  extension = LoadAndLaunchPlatformApp("launch", "Launched");
+  params.show_in_shelf = false;
+  params.window_key = "window1";
+  window1 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  params.show_in_shelf = false;
+  params.window_key = "window2";
+  window2 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  params.show_in_shelf = true;
+  params.window_key = "window3";
+  window3 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  params.show_in_shelf = true;
+  params.window_key = "window4";
+  window4 = CreateAppWindowFromParams(browser()->profile(), extension, params);
+  // There should be 3 items added to the shelf.
+  EXPECT_EQ(item_count + 3, shelf_model->item_count());
+  // Any window close order should be valid
+  CloseAppWindow(window4);
+  // Closed window4 that was shown in shelf. item_count would decrease
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  CloseAppWindow(window1);
+  // Closed window1 which was grouped together with window2 so item_count
+  // would not decrease
+  EXPECT_EQ(item_count + 2, shelf_model->item_count());
+  CloseAppWindow(window3);
+  // Closed window3 that was shown in shelf. item_count would decrease
+  EXPECT_EQ(item_count + 1, shelf_model->item_count());
+  CloseAppWindow(window2);
+  // Closed window2 - there is no other window in that group and item_count
+  // would decrease
+  EXPECT_EQ(item_count, shelf_model->item_count());
+}

[stevenjb, 2016/06/14 18:33:21]

This needs to be broken up

[Andra Paraschiv, 2016/06/28 07:04:46]

Done.

+
 // Checks that the browser Alt "tabbing" is properly done.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestNoDefaultBrowser,
                        AltNumberBrowserTabbing) {
   // Get the number of items in the browser menu.
   EXPECT_EQ(0u, chrome::GetTotalBrowserCount());
   // The first activation should create a browser at index 1 (App List @ 0).
   shelf_->ActivateShelfItem(1);
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   // A second activation should not create a new instance.
   shelf_->ActivateShelfItem(1);
@@ skipping 752 matching lines @@
   // Close all windows.
   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 =
       CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT);
   ASSERT_FALSE(
       IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
 }