New accessibility virtual keyboard behavior in non-sticky mode.

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 5991147c90829ff2176083ab224bce3e3859276d..f071fd5924cc46f10dee99a37f336387fe73a82c 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -71,6 +71,7 @@
 #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"
@@ -1620,14 +1621,51 @@ void RenderWidgetHostViewAura::ExtendSelectionAndDelete(
 }
 
 void RenderWidgetHostViewAura::EnsureCaretInRect(const gfx::Rect& rect) {
+  // Perform overscroll.
   gfx::Rect intersected_rect(
       gfx::IntersectRects(rect, window_->GetBoundsInScreen()));
+  if (!intersected_rect.IsEmpty())

[sky, 2016/08/19 20:21:39]

Generally we only drop {} if the body if the conditional and body are only a
single line. As the body isn't a single line use {}

+    host_->ScrollFocusedEditableNodeIntoRect(
+        ConvertRectFromScreen(intersected_rect));
 
-  if (intersected_rect.IsEmpty())
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVKWindowBehavior))
+    return;
+
+  // Only windows in primary display should be moved by virtual keyboard.
+  display::Screen* screen = display::Screen::GetScreen();
+  if (screen->GetPrimaryDisplay().id() !=
+      screen->GetDisplayNearestWindow(window_).id())
     return;
 
-  host_->ScrollFocusedEditableNodeIntoRect(
-      ConvertRectFromScreen(intersected_rect));
+  // 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) {

[sky, 2016/08/19 20:21:39]

I don't understand the logic here. Why does an existing vk_restore_bounds mean
you set the bounds to it here? Can't EnsureCaretInRect be called multiple times?

[hariank, 2016/08/19 20:32:11]

EnsureCaretInRect is only called when the keyboard is opened or closed, or when
the focus changes to a different window. It is never called twice in succession
on the same window unless the keyboard was opened and then immediately closed,
in which case we would want to restore it. 

[sky, 2016/08/19 22:29:12]

Interesting. Having a method mean totally different things and depend upon call
ordering is super confusing. This is why I said you should add a separate
function OnClientFocusLost  and use it for the second case.

+    // Restore window.
+    top_level_window->SetBounds(*vk_restore_bounds);
+    top_level_window->ClearProperty(
+        aura::client::kVirtualKeyboardRestoreBoundsKey);
+  } else if (rect != screen->GetPrimaryDisplay().bounds()) {
+    // Calculate vertical window shift.
+    gfx::Rect window_bounds = top_level_window->GetBoundsInRootWindow();
+    int vertical_displacement =
+        std::max(0, window_bounds.bottom() - rect.bottom());
+    int shift = std::min(vertical_displacement, window_bounds.y());
+
+    // Set restore bounds and move window.
+    if (shift > 0) {
+      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
 }
 
 bool RenderWidgetHostViewAura::IsTextEditCommandEnabled(