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

chrome/browser/ui/ash/launcher/browser_launcher_item_controller_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/browser_launcher_item_controller.h"
 
 #include <map>
 #include <string>
 
 #include "ash/ash_switches.h"
@@ skipping 156 matching lines @@
     State(BrowserLauncherItemControllerTest* test,
           const std::string& app_id,
           BrowserLauncherItemController::Type launcher_type)
         : launcher_test(test),
           window(NULL),
           tab_strip(&tab_strip_delegate, test->profile()),
           updater(launcher_type,
                   &window,
                   &tab_strip,
                   test->launcher_delegate_.get(),
-                  app_id) {
+                  app_id,
+                  std::string()) {
       window.Init(ui::LAYER_NOT_DRAWN);
       launcher_test->root_window()->AddChild(&window);
       launcher_test->activation_client_->ActivateWindow(&window);
       aura::client::SetActivationDelegate(&window, this);
       aura::client::SetActivationChangeObserver(&window, this);
       updater.Init();
     }
 
     ash::LauncherItem GetUpdaterItem() {
       ash::LauncherID launcher_id =
@@ skipping 86 matching lines @@
     TabStripModel tab_strip(&tab_strip_delegate, profile());
     tab_strip.InsertWebContentsAt(0,
                                   web_contents.get(),
                                   TabStripModel::ADD_ACTIVE);
     aura::Window window(NULL);
     window.Init(ui::LAYER_NOT_DRAWN);
     root_window()->AddChild(&window);
     BrowserLauncherItemController updater(
         LauncherItemController::TYPE_TABBED,
         &window, &tab_strip, launcher_delegate_.get(),
+        std::string(),
         std::string());
     updater.Init();
 
     // There should be one more item.
     ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
     // New item should be added at the end.
     EXPECT_EQ(ash::TYPE_TABBED, GetItem(&updater).type);
   }
 }
 
 // Verifies Panels items work.
 TEST_F(BrowserLauncherItemControllerTest, PanelItem) {
   size_t initial_size = launcher_model_->items().size();
 
   // Add an App panel.
   {
     aura::Window window(NULL);
     TabHelperTabStripModelDelegate tab_strip_delegate;
     TabStripModel tab_strip(&tab_strip_delegate, profile());
     scoped_ptr<content::WebContents> panel_tab(CreateTestWebContents());
     app_tab_helper_->SetAppID(panel_tab.get(), "1");  // Panels are apps.
     tab_strip.InsertWebContentsAt(0,
                                   panel_tab.get(),
                                   TabStripModel::ADD_ACTIVE);
     BrowserLauncherItemController updater(
         LauncherItemController::TYPE_APP_PANEL,
         &window, &tab_strip, launcher_delegate_.get(),
+        std::string(),
         std::string());
     updater.Init();
     ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
     EXPECT_EQ(ash::TYPE_APP_PANEL, GetItem(&updater).type);
     EXPECT_EQ(static_cast<void*>(NULL), updater.favicon_loader_.get());
   }
 
   // Add an Extension panel.
   {
     aura::Window window(NULL);
     TabHelperTabStripModelDelegate tab_strip_delegate;
     TabStripModel tab_strip(&tab_strip_delegate, profile());
     scoped_ptr<content::WebContents> panel_tab(CreateTestWebContents());
     app_tab_helper_->SetAppID(panel_tab.get(), "1");  // Panels are apps.
     tab_strip.InsertWebContentsAt(0,
                                   panel_tab.get(),
                                   TabStripModel::ADD_ACTIVE);
     BrowserLauncherItemController updater(
         LauncherItemController::TYPE_EXTENSION_PANEL,
         &window, &tab_strip, launcher_delegate_.get(),
+        std::string(),
         std::string());
     updater.Init();
     ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
     EXPECT_EQ(ash::TYPE_PLATFORM_APP, GetItem(&updater).type);
     EXPECT_NE(static_cast<void*>(NULL), updater.favicon_loader_.get());
   }
 }
 
 // Verifies pinned apps are persisted and restored.
 TEST_F(BrowserLauncherItemControllerTest, PersistPinned) {
@@ skipping 110 matching lines @@
   EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status);
 
   // App window should go to attention state.
   app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status);
 
   // Activating app window should clear attention state.
   activation_client_->ActivateWindow(&app_state.window);
   EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);
 }