New accessibility virtual keyboard behavior in non-sticky mode.

content/browser/renderer_host/render_widget_host_view_aura.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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 55 matching lines @@
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/compositor_vsync_manager.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/blink/web_input_event.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
@@ skipping 1332 matching lines @@
 }
 
 void RenderWidgetHostViewAura::ExtendSelectionAndDelete(
     size_t before, size_t after) {
   RenderFrameHostImpl* rfh = GetFocusedFrame();
   if (rfh)
     rfh->ExtendSelectionAndDelete(before, after);
 }
 
 void RenderWidgetHostViewAura::EnsureCaretOutOfRect(const gfx::Rect& rect) {
-  gfx::Rect hiding_area_in_this_window(
+  // Perform overscroll.
+  const gfx::Rect hiding_area_in_this_window(
       gfx::IntersectRects(rect, window_->GetBoundsInScreen()));
+  if (hiding_area_in_this_window.IsEmpty()) {
+    OnClientFocusLost();
+    return;
+  }
 
-  if (hiding_area_in_this_window.IsEmpty())
+  const gfx::Rect visible_area_in_this_window(gfx::SubtractRects(
+      window_->GetBoundsInScreen(), hiding_area_in_this_window));
+
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVirtualKeyboardBehavior))
     return;
 
+  aura::Window* top_level_window = window_->GetToplevelWindow();
+  // Calculate vertical window shift.
+  const gfx::Rect window_bounds = top_level_window->GetBoundsInRootWindow();
+  const int vertical_displacement =
+      std::max(0, top_level_window->GetBoundsInScreen().bottom() -
+                      visible_area_in_this_window.bottom());
+  const int shift = std::min(vertical_displacement, window_bounds.y());
+
+  // Set restore bounds and move window.
+  if (shift > 0) {
+    const gfx::Point origin(window_bounds.x(), window_bounds.y() - shift);
+    top_level_window->SetProperty(
+        aura::client::kVirtualKeyboardRestoreBoundsKey,
+        new gfx::Rect(window_bounds));
+    top_level_window->SetBounds(gfx::Rect(origin, window_bounds.size()));
+  }
+#endif  // defined(OS_CHROMEOS)
+
   host_->ScrollFocusedEditableNodeIntoRect(
-      ConvertRectFromScreen(gfx::SubtractRects(window_->GetBoundsInScreen(),
-                                               hiding_area_in_this_window)));
+      ConvertRectFromScreen(visible_area_in_this_window));
+}
+
+void RenderWidgetHostViewAura::OnClientFocusLost() {
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVirtualKeyboardBehavior))
+    return;
+
+  // Get restore bounds of window.
+  aura::Window* top_level_window = window_->GetToplevelWindow();
+  gfx::Rect* vk_restore_bounds = top_level_window->GetProperty(
+      aura::client::kVirtualKeyboardRestoreBoundsKey);
+
+  if (vk_restore_bounds) {
+    // Restore window.
+    top_level_window->SetBounds(*vk_restore_bounds);
+    top_level_window->ClearProperty(
+        aura::client::kVirtualKeyboardRestoreBoundsKey);
+  }
+#endif  // defined(OS_CHROMEOS)
 }
 
 bool RenderWidgetHostViewAura::IsTextEditCommandEnabled(
     ui::TextEditCommand command) const {
   return false;
 }
 
 void RenderWidgetHostViewAura::SetTextEditCommandForNextKeyEvent(
     ui::TextEditCommand command) {}
 
@@ skipping 942 matching lines @@
 
 void RenderWidgetHostViewAura::SetPopupChild(
     RenderWidgetHostViewAura* popup_child_host_view) {
   popup_child_host_view_ = popup_child_host_view;
   event_handler_->SetPopupChild(
       popup_child_host_view,
       popup_child_host_view ? popup_child_host_view->event_handler() : nullptr);
 }
 
 }  // namespace content