Showing launcher items for windowed v1 apps - pinned or not. Also - don't show windowed v1 apps in …

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 123 matching lines @@
 
   // Installing |extension3_| should add it to the launcher.
   extension_service_->AddExtension(extension3_.get());
   EXPECT_EQ(3, model_.item_count());
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_.items()[kExpectedAppIndex].type);
   EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
   EXPECT_FALSE(launcher_controller.IsAppPinned(extension2_->id()));
   EXPECT_TRUE(launcher_controller.IsAppPinned(extension3_->id()));
 }
 
+// Check that simple locking of an application will 'create' a launcher item.
+TEST_F(ChromeLauncherControllerPerAppTest, CheckLockApps) {
+  ChromeLauncherControllerPerApp launcher_controller(profile(), &model_);
+  launcher_controller.Init();
+
+  // Model should only contain the browser shortcut and app list items.
+  EXPECT_EQ(2, model_.item_count());
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension2_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension2_->id()));
+
+  launcher_controller.LockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_WINDOWED_APP, model_.items()[kExpectedAppIndex].type);
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_TRUE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension2_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension2_->id()));
+
+  launcher_controller.UnlockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(2, model_.item_count());
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension2_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension2_->id()));
+}
+
+// Check that multiple locks of an application will be properly handled.
+TEST_F(ChromeLauncherControllerPerAppTest, CheckMukltiLockApps) {
+  ChromeLauncherControllerPerApp launcher_controller(profile(), &model_);
+  launcher_controller.Init();
+
+  // Model should only contain the browser shortcut and app list items.
+  EXPECT_EQ(2, model_.item_count());
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  for (int i = 0; i < 2; i++) {
+    launcher_controller.LockV1AppWithID(extension1_->id());
+
+    EXPECT_EQ(3, model_.item_count());
+    EXPECT_EQ(ash::TYPE_WINDOWED_APP, model_.items()[kExpectedAppIndex].type);
+    EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+    EXPECT_TRUE(launcher_controller.IsWindowedAppInLauncher(
+        extension1_->id()));
+  }
+
+  launcher_controller.UnlockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_WINDOWED_APP, model_.items()[kExpectedAppIndex].type);
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_TRUE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.UnlockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(2, model_.item_count());
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension2_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+}
+
+// Check that already pinned items are not effected by locks.
+TEST_F(ChromeLauncherControllerPerAppTest, CheckAlreadyPinnedLockApps) {
+  ChromeLauncherControllerPerApp launcher_controller(profile(), &model_);
+  launcher_controller.Init();
+
+  // Model should only contain the browser shortcut and app list items.
+  EXPECT_EQ(2, model_.item_count());
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.PinAppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_.items()[kExpectedAppIndex].type);
+  EXPECT_TRUE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.LockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_.items()[kExpectedAppIndex].type);
+  EXPECT_TRUE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.UnlockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_.items()[kExpectedAppIndex].type);
+  EXPECT_TRUE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.UnpinAppsWithID(extension1_->id());
+
+  EXPECT_EQ(2, model_.item_count());
+}
+
+// Check that already pinned items which get locked stay after unpinning.
+TEST_F(ChromeLauncherControllerPerAppTest, CheckPinnedAppsStayAfterUnlock) {
+  ChromeLauncherControllerPerApp launcher_controller(profile(), &model_);
+  launcher_controller.Init();
+
+  // Model should only contain the browser shortcut and app list items.
+  EXPECT_EQ(2, model_.item_count());
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.PinAppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_.items()[kExpectedAppIndex].type);
+  EXPECT_TRUE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.LockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_.items()[kExpectedAppIndex].type);
+  EXPECT_TRUE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.UnpinAppsWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_WINDOWED_APP, model_.items()[kExpectedAppIndex].type);
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_TRUE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.UnlockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(2, model_.item_count());
+}
+
+// Check that lock -> pin -> unlock -> unpin does properly transition.
+TEST_F(ChromeLauncherControllerPerAppTest, CheckLockPinUnlockUnpin) {
+  ChromeLauncherControllerPerApp launcher_controller(profile(), &model_);
+  launcher_controller.Init();
+
+  // Model should only contain the browser shortcut and app list items.
+  EXPECT_EQ(2, model_.item_count());
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.LockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_WINDOWED_APP, model_.items()[kExpectedAppIndex].type);
+  EXPECT_FALSE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_TRUE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.PinAppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_.items()[kExpectedAppIndex].type);
+  EXPECT_TRUE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.UnlockV1AppWithID(extension1_->id());
+
+  EXPECT_EQ(3, model_.item_count());
+  EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_.items()[kExpectedAppIndex].type);
+  EXPECT_TRUE(launcher_controller.IsAppPinned(extension1_->id()));
+  EXPECT_FALSE(launcher_controller.IsWindowedAppInLauncher(extension1_->id()));
+
+  launcher_controller.UnpinAppsWithID(extension1_->id());
+
+  EXPECT_EQ(2, model_.item_count());
+}
+
 TEST_F(ChromeLauncherControllerPerAppTest, Policy) {
   extension_service_->AddExtension(extension1_.get());
   extension_service_->AddExtension(extension3_.get());
 
   base::ListValue policy_value;
   InsertPrefValue(&policy_value, 0, extension1_->id());
   InsertPrefValue(&policy_value, 1, extension2_->id());
   profile()->GetTestingPrefService()->SetManagedPref(prefs::kPinnedLauncherApps,
                                                      policy_value.DeepCopy());
 
@@ skipping 333 matching lines @@
   {
     scoped_ptr<ui::MenuModel> menu(
         launcher_controller.CreateApplicationMenu(item_gmail));
     int first_item =
         (menu->GetTypeAt(0) == ui::MenuModel::TYPE_SEPARATOR) ? 1 : 0;
     menu->ActivatedAt(first_item + 3);
   }
   // Now the active tab should be the second item.
   EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
 }