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"
-#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(

[flackr, 2014/04/14 20:31:18]

This isn't really the root window, call this overlay_container.

[Nina, 2014/04/15 15:15:03]

Could you please elaborate a bit more on how to call overlay_container?

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

I simply mean call this variable overlay_container instead of root_window since
it is the overlay container and not the root window.

+      window->GetRootWindow(),
+      ash::kShellWindowId_OverlayContainer);
+  Cycle(WindowSelector::FORWARD);
+  unsigned int children = root_window->children().size();
+  FireOverviewStartTimer();

[flackr, 2014/04/14 20:31:18]

I'd prefer that tests which aren't about alt tab cycling use ToggleOverview().

[Nina, 2014/04/15 15:15:03]

Done.

+  // 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.

[flackr, 2014/04/14 20:31:18]

This is very specific to the implementation. I.e. this test will need to be
updated anytime we change what visuals are created by overview mode. This should
use friend access to the WindowSelectorItem class's member to fetch the widget
directly.

[Nina, 2014/04/15 15:15:03]

I understand it's very dependent on the implementation. However, I don't see how
we can use a friend function to solve this. The only thing that comes to my mind
is making WindowSelectorItem hold a static pointer to the last label created...
which is kinda ugly isn't it? How would you suggest doing it?

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

WindowSelector has friend class WindowSelectorTest which means the base test
class can directly access the windows_ vector. I'm proposing directly accessing
the windows_ vector to get the WindowSelectorItem and directly accessing the
label widget in that item.

+  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(widget);
+  views::Label* label = static_cast<views::Label*>(widget->GetContentsView());
+  EXPECT_EQ(label->text(), window_title);

[flackr, 2014/04/14 20:31:18]

I'd expect that verifying the label is under the window would verify the
position.

[Nina, 2014/04/15 15:15:03]

True, I'll work on this.

+  StopCycling();
+}
+
+// Test that a label is created under the panel on entering overview mode.
+TEST_F(WindowSelectorTest, CreateLabelUnderPanel) {

[flackr, 2014/04/14 20:31:18]

Same comments as above, though since the position is already verified it may
only be necessary to verify the most recently active (i.e. frontmost) panel
title is used.

+  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();
+  // 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(widget);
+  views::Label* label = static_cast<views::Label*>(widget->GetContentsView());
+  EXPECT_EQ(label->text(), panel_title);
+  StopCycling();
+}
+
 }  // namespace ash