Added labels under the windows in OverviewMode displaying their current name.

ash/wm/overview/window_selector_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/drag_drop/drag_drop_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
+#include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"

[flackr, 2014/04/16 17:24:55]

You're getting the compile error because you removed the include of
"ash/test/shell_test_api.h" which is still referenced by the DragDropInProgress
test.

-#include "ash/test/shell_test_api.h"
 #include "ash/test/test_shelf_delegate.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/window_selector.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/transform.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/widget/native_widget_aura.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_delegate.h"
 
 namespace ash {
 namespace {
 
 class NonActivatableActivationDelegate
     : public aura::client::ActivationDelegate {
  public:
   virtual bool ShouldActivate() const OVERRIDE {
@@ skipping 1032 matching lines @@
 
     for (size_t p = 0; p < arraysize(points); ++p) {
       ui::MouseEvent event(ui::ET_MOUSE_MOVED, points[p], points[p],
                            ui::EF_NONE, ui::EF_NONE);
       EXPECT_EQ(windows[w],
                 targeter->FindTargetForEvent(root_target, &event));
     }
   }
 }
 
+// Test that a label is created under the window on entering overview mode.
+TEST_F(WindowSelectorTest, CreateLabelUnderWindow) {
+  scoped_ptr<aura::Window> window(CreateWindow(gfx::Rect(0, 0, 100, 100)));
+  base::string16 window_title = base::UTF8ToUTF16("My window");
+  window->set_title(window_title);
+  aura::Window* root_window = Shell::GetContainer(
+      window->GetRootWindow(),
+      ash::kShellWindowId_OverlayContainer);
+  unsigned int children = root_window->children().size();
+  ToggleOverview();
+  // There should be two more windows, one for the close button and one for the
+  // label.
+  EXPECT_EQ(children + 2, root_window->children().size())
+      << root_window->children().size() - children
+      << " windows have been added instead of the expected 2.";
+  // The window that contains the label is always the last one in the windows
+  // vector.
+  aura::Window* label_window = root_window->children().back();
+  aura::WindowDelegate* delegate = label_window->delegate();
+  views::NativeWidgetAura* native_delegate =
+      static_cast<views::NativeWidgetAura*>(delegate);
+  views::Widget* widget = native_delegate->GetWidget();
+  ASSERT_TRUE(widget);
+  views::Label* label = static_cast<views::Label*>(widget->GetContentsView());
+  EXPECT_EQ(label->text(), window_title);
+  StopCycling();
+}
+
+// Test that a label is created under the panel on entering overview mode.
+TEST_F(WindowSelectorTest, CreateLabelUnderPanel) {
+  scoped_ptr<aura::Window> panel(CreatePanelWindow(gfx::Rect(0, 0, 100, 100)));
+  base::string16 panel_title = base::UTF8ToUTF16("My panel");
+  panel->set_title(panel_title);
+  aura::Window* root_window = Shell::GetContainer(
+      panel->GetRootWindow(),
+      ash::kShellWindowId_OverlayContainer);
+  Cycle(WindowSelector::FORWARD);
+  unsigned int children = root_window->children().size();
+  FireOverviewStartTimer();

[flackr, 2014/04/16 02:37:10]

Same as above, please use ToggleOverview.

+  // There should be only one additional window, since panels don't have close
+  // buttons.
+  EXPECT_EQ(children + 1, root_window->children().size())
+      << root_window->children().size() - children
+      << " windows have been added instead of the expected 1.";
+  // The window that contains the label is always the last one in the windows
+  // vector.
+  aura::Window* label_window = root_window->children().back();
+  aura::WindowDelegate* delegate = label_window->delegate();
+  views::NativeWidgetAura* native_delegate =
+      static_cast<views::NativeWidgetAura*>(delegate);
+  views::Widget* widget = native_delegate->GetWidget();
+  ASSERT_TRUE(widget);
+  views::Label* label = static_cast<views::Label*>(widget->GetContentsView());
+  EXPECT_EQ(label->text(), panel_title);
+  StopCycling();
+}
+
 }  // namespace ash