Addressing dialog cropping by the virtual keyboard for M36

ash/wm/system_modal_container_layout_manager.cc

 // Copyright (c) 2012 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/system_modal_container_layout_manager.h"
 
 #include <cmath>
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 254 matching lines @@
     if (!bounds.IsEmpty()) {
       valid_bounds.set_height(std::max(
           0, valid_bounds.height() - bounds.height()));
     }
   }
   return valid_bounds;
 }
 
 gfx::Rect SystemModalContainerLayoutManager::GetCenteredAndOrFittedBounds(
     const aura::Window* window) {
+  gfx::Rect target_bounds;
+  gfx::Rect usable_area = GetUsableDialogArea();
   if (window->GetProperty(kCenteredKey)) {
     // Keep the dialog centered if it was centered before.
-    gfx::Rect target_bounds = GetUsableDialogArea();
+    target_bounds = usable_area;
     target_bounds.ClampToCenteredSize(window->bounds().size());
-    return target_bounds;
+  } else {
+    // Keep the dialog within the usable area.
+    target_bounds = window->bounds();
+    target_bounds.AdjustToFit(usable_area);
   }
-  gfx::Rect target_bounds = window->bounds();
-  target_bounds.AdjustToFit(GetUsableDialogArea());
+  if (usable_area != container_->bounds()) {
+    // Don't clamp the dialog for the keyboard. Keep the size as it is but make
+    // sure that the top remains visible.
+    // TODO(skuhne): M37 should add over scroll functionality to address this.
+    target_bounds.set_size(window->bounds().size());
+  }
   return target_bounds;
 }
 
 bool SystemModalContainerLayoutManager::DialogIsCentered(
     const gfx::Rect& window_bounds) {
   gfx::Point window_center = window_bounds.CenterPoint();
   gfx::Point container_center = GetUsableDialogArea().CenterPoint();
   return
       std::abs(window_center.x() - container_center.x()) < kCenterPixelDelta &&
       std::abs(window_center.y() - container_center.y()) < kCenterPixelDelta;
 }
 
 }  // namespace ash