Fixes bug where shelf items could be added for children windows

ash/common/shelf/shelf_window_watcher_unittest.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 "ash/common/shelf/shelf_window_watcher.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 289 matching lines @@
 
   // Each ShelfItem is removed when the associated window is destroyed.
   panel_widget.CloseNow();
   EXPECT_EQ(3, model_->item_count());
   widget2.reset();
   EXPECT_EQ(2, model_->item_count());
   widget1.reset();
   EXPECT_EQ(1, model_->item_count());
 }
 
+TEST_F(ShelfWindowWatcherTest, DontCreateShelfEntriesForChildWindows) {
+  const int initial_item_count = model_->item_count();
+
+  WmWindow* window = WmShell::Get()->NewWindow(ui::wm::WINDOW_TYPE_NORMAL,
+                                               ui::LAYER_NOT_DRAWN);
+  window->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_APP);
+  WmShell::Get()
+      ->GetPrimaryRootWindow()
+      ->GetChildByShellWindowId(kShellWindowId_DefaultContainer)
+      ->AddChild(window);
+  window->Show();
+  EXPECT_EQ(initial_item_count + 1, model_->item_count());
+
+  WmWindow* child_window = WmShell::Get()->NewWindow(ui::wm::WINDOW_TYPE_NORMAL,
+                                                     ui::LAYER_NOT_DRAWN);
+  child_window->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_APP);
+  window->AddChild(child_window);
+  child_window->Show();
+  // |child_window| should not result in adding a new entry.
+  EXPECT_EQ(initial_item_count + 1, model_->item_count());
+
+  child_window->Destroy();
+  window->Destroy();
+  EXPECT_EQ(initial_item_count, model_->item_count());
+}
+
 }  // namespace ash