[cros touch] Proper handling of non-maximized/fullscreen windows in lock screen container

ash/wm/lock_window_state.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/wm/lock_window_state.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/lock_layout_manager.h"
 #include "ash/wm/window_animations.h"
@@ skipping 41 matching lines @@
     case wm::WM_EVENT_MAXIMIZE:
       UpdateWindow(window_state,
                    GetMaximizedOrCenteredWindowType(window_state));
       return;
     case wm::WM_EVENT_MINIMIZE:
       UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_MINIMIZED);
       return;
     case wm::WM_EVENT_SHOW_INACTIVE:
       return;
     case wm::WM_EVENT_SET_BOUNDS:
-      UpdateBounds(window_state);
+      if (window_state->IsMaximized() || window_state->IsFullscreen()) {
+        UpdateBounds(window_state);
+      } else {
+        const ash::wm::SetBoundsEvent* bounds_event =
+            static_cast<const ash::wm::SetBoundsEvent*>(event);
+        window_state->SetBoundsConstrained(bounds_event->requested_bounds());
+      }
       break;
     case wm::WM_EVENT_ADDED_TO_WORKSPACE:
       if (current_state_type_ != wm::WINDOW_STATE_TYPE_MAXIMIZED &&
           current_state_type_ != wm::WINDOW_STATE_TYPE_MINIMIZED &&
           current_state_type_ != wm::WINDOW_STATE_TYPE_FULLSCREEN) {
         UpdateWindow(window_state,
                      GetMaximizedOrCenteredWindowType(window_state));
       }
       break;
     case wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED:
@@ skipping 74 matching lines @@
   }
 }
 
 wm::WindowStateType LockWindowState::GetMaximizedOrCenteredWindowType(
       wm::WindowState* window_state) {
   return window_state->CanMaximize() ? wm::WINDOW_STATE_TYPE_MAXIMIZED :
                                        wm::WINDOW_STATE_TYPE_NORMAL;
 }
 
 void LockWindowState::UpdateBounds(wm::WindowState* window_state) {
+  if (!window_state->IsMaximized() && !window_state->IsFullscreen())
+    return;
+
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   gfx::Rect keyboard_bounds;
 
   if (keyboard_controller && !keyboard::IsKeyboardOverscrollEnabled())
     keyboard_bounds = keyboard_controller->current_keyboard_bounds();
 
   gfx::Rect bounds =
       ScreenUtil::GetDisplayBoundsInParent(window_state->window());
   bounds.set_height(bounds.height() - keyboard_bounds.height());
   window_state->SetBoundsDirect(bounds);
 }
 
 }  // namespace ash