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/overview/window_selector_item.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 170 matching lines @@
   }
 
   bool IsSelecting() {
     return ash::Shell::GetInstance()->window_selector_controller()->
         IsSelecting();
   }
 
   aura::Window* GetFocusedWindow() {
     return aura::client::GetFocusClient(
         Shell::GetPrimaryRootWindow())->GetFocusedWindow();
+    }
+
+  ScopedVector<WindowSelectorItem>* GetWindowItems() {
+    return &(ash::Shell::GetInstance()->window_selector_controller()->
+        window_selector_->windows_);
+    }
+
+  views::Widget* GetLabelWidget(ash::WindowSelectorItem* window) {
+    return window->window_label_.get();
   }
 
   test::ShelfViewTestAPI* shelf_view_test() {
     return shelf_view_test_.get();
   }
 
  private:
   aura::test::TestWindowDelegate delegate_;
   NonActivatableActivationDelegate non_activatable_activation_delegate_;
   scoped_ptr<test::ShelfViewTestAPI> shelf_view_test_;
@@ skipping 842 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);
+  ToggleOverview();
+  WindowSelectorItem* window_item = GetWindowItems()->back();
+  views::Widget* widget = GetLabelWidget(window_item);
+  // Has the label widget been created?
+  ASSERT_TRUE(widget);
+  views::Label* label = static_cast<views::Label*>(widget->GetContentsView());
+  // Verify the label matches the window title.
+  EXPECT_EQ(label->text(), window_title);
+  // Labels are located based on target_bounds, not the actual window item
+  // bounds.
+  gfx::Rect target_bounds(window_item->target_bounds());
+  gfx::Rect expected_label_bounds(target_bounds.x(),
+                                  target_bounds.y() + target_bounds.height(),
+                                  target_bounds.width(),
+                                  20);
+  gfx::Rect real_label_bounds = widget->GetNativeWindow()->bounds();
+  EXPECT_EQ(widget->GetNativeWindow()->bounds(), real_label_bounds);
+}
+
+// Test that a label is created under the panel on entering overview mode.

[flackr, 2014/04/17 03:44:29]

I think the only thing that's special about panels is that there could be more
than one and only the active one will have a title listed. Could you change this
test to create 2 panels and verify that the active one is the one whose title is
used?

[Nina, 2014/04/17 15:02:19]

Done.

+TEST_F(WindowSelectorTest, CreateLabelUnderPanel) {
+  scoped_ptr<aura::Window> window(CreatePanelWindow(gfx::Rect(0, 0, 100, 100)));
+  base::string16 window_title = base::UTF8ToUTF16("My panel");
+  window->set_title(window_title);
+  ToggleOverview();
+  WindowSelectorItem* window_item = GetWindowItems()->back();
+  views::Widget* widget = GetLabelWidget(window_item);
+  // Has the label widget been created?
+  ASSERT_TRUE(widget);
+  views::Label* label = static_cast<views::Label*>(widget->GetContentsView());
+  // Verify the label matches the window title.
+  EXPECT_EQ(label->text(), window_title);
+}
+
 }  // namespace ash