Fix stale keyboard bounds on login screen

ash/wm/lock_layout_manager_unittest.cc

 // Copyright 2014 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/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
@@ skipping 165 matching lines @@
   const gfx::Rect bounds2 = gfx::Rect(100, 100, 200, 200);
   maximized_window->SetBounds(bounds2);
   fullscreen_window->SetBounds(bounds2);
   EXPECT_EQ(screen_bounds.ToString(),
             maximized_window->GetBoundsInScreen().ToString());
   EXPECT_EQ(screen_bounds.ToString(),
             fullscreen_window->GetBoundsInScreen().ToString());
 }
 
 TEST_F(LockLayoutManagerTest, KeyboardBounds) {
-  gfx::Rect screen_bounds = Shell::GetScreen()->GetPrimaryDisplay().bounds();
+  gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
+  gfx::Rect screen_bounds = primary_display.bounds();
 
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   widget_params.show_state = ui::SHOW_STATE_FULLSCREEN;
   scoped_ptr<aura::Window> window(
       CreateTestLoginWindow(widget_params, false /* use_delegate */));
 
   EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
 
   // When virtual keyboard overscroll is enabled keyboard bounds should not
   // affect window bounds.
   keyboard::SetKeyboardOverscrollOverride(
        keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_ENABLED);
   ShowKeyboard(true);
   EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
+  gfx::Rect keyboard_bounds =
+      keyboard::KeyboardController::GetInstance()->current_keyboard_bounds();
+  EXPECT_NE(keyboard_bounds, gfx::Rect());
   ShowKeyboard(false);
 
+  // When keyboard is hidden make sure that rotating the screen gives 100% of
+  // screen size to window.
+  keyboard::SetKeyboardOverscrollOverride(
+       keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_DISABLED);
+  ShowKeyboard(true);
+  ShowKeyboard(false);

[oshima, 2014/08/21 15:32:50]

why turning on and off? 

[Nikita (slow), 2014/08/21 16:00:41]

This is the way to reproduce this bug before the fix:
invalid keyboard bounds got cached and then LockWindowState used those to offset
maximized window even though keyboard is hidden.

[oshima, 2014/08/21 16:32:39]

Can you mention that this is to repro a bug  (with bug#)

[Nikita (slow), 2014/08/21 16:38:27]

Done.

+  ash::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
+  display_manager->SetDisplayRotation(primary_display.id(),
+                                      gfx::Display::ROTATE_90);
+  screen_bounds = primary_display.bounds();

[oshima, 2014/08/21 16:32:39]

screen_bounds = Shell::GetScreen()->GetPrimaryDisplay()->bounds();

should work

[Nikita (slow), 2014/08/21 16:38:27]

Done.

+
+  // We can't rely on screen_bounds.ToString() here since rotation doesn't
+  // affect how bounds are stored.

[oshima, 2014/08/21 15:32:50]

rotation should update the display bounds. Have you tried to get the display
bounds again?

[Nikita (slow), 2014/08/21 16:00:41]

I'm getting updated screen bounds:
screen_bounds = primary_display.bounds();

But window->GetBoundsInScreen() is not taking rotation into account.

+  EXPECT_EQ(screen_bounds.origin(), window->GetBoundsInScreen().origin());
+  EXPECT_EQ(screen_bounds.width(), window->GetBoundsInScreen().height());
+  EXPECT_EQ(screen_bounds.height(), window->GetBoundsInScreen().width());
+  display_manager->SetDisplayRotation(primary_display.id(),
+                                      gfx::Display::ROTATE_0);
+
   // When virtual keyboard overscroll is disabled keyboard bounds do
   // affect window bounds.
   keyboard::SetKeyboardOverscrollOverride(
        keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_DISABLED);
   ShowKeyboard(true);
   keyboard::KeyboardController* keyboard =
         keyboard::KeyboardController::GetInstance();
   gfx::Rect target_bounds(screen_bounds);
   target_bounds.set_height(target_bounds.height() -
       keyboard->proxy()->GetKeyboardWindow()->bounds().height());
@@ skipping 49 matching lines @@
       ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get());
   window->SetBounds(work_area);
   // Usually work_area takes Shelf into account but that doesn't affect
   // LockScreen container windows.
   EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString());
   EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
 }
 
 }  // namespace test
 }  // namespace ash