Selecting an app window from the overview mode maximizes the window only if it's maximizable

athena/wm/window_manager_unittest.cc

Index: athena/wm/window_manager_unittest.cc
diff --git a/athena/wm/window_manager_unittest.cc b/athena/wm/window_manager_unittest.cc
index 636686a193ade2b3ded2902cbeb7cc6b7ee1bedf..3fd62d911e4f2886597e8bcd3e20f95fa50f6ff2 100644
--- a/athena/wm/window_manager_unittest.cc
+++ b/athena/wm/window_manager_unittest.cc
@@ -11,6 +11,7 @@
 #include "athena/wm/split_view_controller.h"
 #include "athena/wm/test/window_manager_impl_test_api.h"
 #include "athena/wm/window_manager_impl.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ -101,6 +102,59 @@ TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
   EXPECT_FALSE(w1->IsVisible());
 }
 
+TEST_F(WindowManagerTest, OnSelectWindow) {
+  test::WindowManagerImplTestApi wm_api;
+  aura::test::TestWindowDelegate delegate1;
+  aura::test::TestWindowDelegate delegate2;
+  aura::test::TestWindowDelegate delegate3;
+
+  // (w1): A window that sets a maximum size
+  delegate1.set_maximum_size(gfx::Size(300, 200));
+  scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate1));
+  w1->SetBounds(gfx::Rect(0, 0, 300, 200));
+
+  // (w2): A window that doesn't set a max size and is maximizable
+  scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate2));
+  w2->SetBounds(gfx::Rect(0, 0, 300, 200));
+  w2->SetProperty(aura::client::kCanMaximizeKey, true);
+
+  // (w3): A window that doesn't set a max size but is NOT maximizable
+  scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate3));
+  w3->SetBounds(gfx::Rect(0, 0, 300, 200));
+  w3->SetProperty(aura::client::kCanMaximizeKey, false);
+
+  const gfx::Size old_bounds1 = w1->GetTargetBounds().size();
+  const gfx::Size old_bounds2 = w2->GetTargetBounds().size();
+  const gfx::Size old_bounds3 = w3->GetTargetBounds().size();
+  const gfx::Size work_area =
+      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().size();
+
+  // Select w1, which has a max size, in the overview mode and make sure it's
+  // not maximized.
+  WindowManager::Get()->EnterOverview();
+  WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
+  overview_delegate->OnSelectWindow(w1.get());
+  const gfx::Size new_bounds1 = w1->GetTargetBounds().size();
+  EXPECT_EQ(new_bounds1.ToString(), old_bounds1.ToString());
+  EXPECT_NE(work_area.ToString(), new_bounds1.ToString());
+
+  // Select w2, which has no max size & can be maximized, in the overview
+  // mode and make sure it's actually maximized.
+  WindowManager::Get()->EnterOverview();
+  overview_delegate->OnSelectWindow(w2.get());
+  const gfx::Size new_bounds2 = w2->GetTargetBounds().size();
+  EXPECT_NE(new_bounds2.ToString(), old_bounds2.ToString());
+  EXPECT_EQ(work_area.ToString(), new_bounds2.ToString());
+
+  // Select w3, which has no max size & cannot be maximized, in the overview
+  // mode and make sure it's not maximized.
+  WindowManager::Get()->EnterOverview();
+  overview_delegate->OnSelectWindow(w3.get());
+  const gfx::Size new_bounds3 = w3->GetTargetBounds().size();
+  EXPECT_EQ(new_bounds3.ToString(), old_bounds3.ToString());
+  EXPECT_NE(work_area.ToString(), new_bounds3.ToString());
+}
+
 TEST_F(WindowManagerTest, NewWindowFromOverview) {
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
@@ -332,12 +386,14 @@ TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
 
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
+  w1->SetProperty(aura::client::kCanMaximizeKey, true);
 
   // Splitview mode needs at least two windows.
   wm_api.wm()->ToggleSplitView();
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
 
   scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
+  w2->SetProperty(aura::client::kCanMaximizeKey, true);

[oshima, 2014/10/25 01:35:43]

you can set this in CreateAndActivateWindow

[afakhry, 2014/10/27 16:10:05]

I wanted to do this, but I was afraid that it might affect other tests. It
doesn't, so consider it done.

[afakhry, 2014/10/27 16:10:05]

Done.

   w2->Show();
 
   wm_api.wm()->ToggleSplitView();
@@ -352,8 +408,16 @@ TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
   wm_api.wm()->ToggleSplitView();
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
 
-  EXPECT_EQ(width, w1->bounds().width());
+  // w2 is the top window, it should be resized to max width and must be visible
+  // w1 should be hidden.
   EXPECT_EQ(width, w2->bounds().width());
+  EXPECT_TRUE(w2->IsVisible());
+  EXPECT_FALSE(w1->IsVisible());
+
+  // Expect w1 to be visible and maximized when activated.
+  w1->Show();

[oshima, 2014/10/25 01:35:43]

I assume wm::ActivateWindow(w1.get()) didn't work, correct?

[afakhry, 2014/10/27 16:10:05]

It actually works but it doesn't make the window visible. Even in
WindowManagerImpl::OnSelectWindow() window activation and showing are two
separate operations.

Would you like me to use wm::ActivateWindow() instead?

[oshima, 2014/10/27 18:20:53]

That's what I expected and meant by "doesn't work".
No, this is ok for now. Can you add the following?

// TODO(oshima): To change to wm::ActivateWindow once the correct window state
is implemented.

[afakhry, 2014/10/27 18:57:24]

Done.

+  EXPECT_EQ(width, w1->bounds().width());
+  EXPECT_TRUE(w1->IsVisible());
 }
 
 TEST_F(WindowManagerTest, OverviewModeFromSplitMode) {