New accessibility virtual keyboard behavior in non-sticky mode.

ui/views/controls/textfield/textfield.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 "ui/views/controls/textfield/textfield.h"
 
 #include <string>
 #include <utility>
 
+#include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_action_data.h"
 #include "ui/accessibility/ax_node_data.h"
+#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/default_style.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/canvas_painter.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
@@ skipping 1399 matching lines @@
   gfx::Range range = GetRenderText()->selection();
   DCHECK_GE(range.start(), before);
 
   range.set_start(range.start() - before);
   range.set_end(range.end() + after);
   gfx::Range text_range;
   if (GetTextRange(&text_range) && text_range.Contains(range))
     DeleteRange(range);
 }
 
-void Textfield::EnsureCaretOutOfRect(const gfx::Rect& rect) {}
+void Textfield::EnsureCaretOutOfRect(const gfx::Rect& rect) {
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVirtualKeyboardBehavior))
+    return;
+
+  const gfx::Rect hiding_area_in_this_window(
+      gfx::IntersectRects(rect, GetNativeView()->GetBoundsInScreen()));
+  if (hiding_area_in_this_window.IsEmpty()) {
+    // The window isn't covered by the keyboad, restore the window position if
+    // necessary
+    OnClientFocusLost();
+    return;
+  }
+
+  aura::Window* top_level_window = GetNativeView()->GetToplevelWindow();
+  // Calculate vertical window shift.
+  gfx::Rect visible_area_in_this_window(gfx::SubtractRects(
+      GetNativeView()->GetBoundsInScreen(), hiding_area_in_this_window));
+  const int vertical_displacement =
+      std::max(0, top_level_window->GetBoundsInScreen().bottom() -
+                      visible_area_in_this_window.bottom());
+  const gfx::Rect window_bounds = top_level_window->GetBoundsInRootWindow();
+  const 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  // defined(OS_CHROMEOS)
+}
+
+void Textfield::OnClientFocusLost() {
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVirtualKeyboardBehavior))
+    return;
+
+  // Only windows in primary display should be moved by virtual keyboard.
+  display::Screen* screen = display::Screen::GetScreen();
+  if (screen->GetPrimaryDisplay().id() !=
+      screen->GetDisplayNearestWindow(GetNativeView()).id())
+    return;
+
+  // Get restore bounds of window.
+  aura::Window* top_level_window = GetNativeView()->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 Textfield::IsTextEditCommandEnabled(ui::TextEditCommand command) const {
   base::string16 result;
   bool editable = !read_only();
   bool readable = text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD;
   switch (command) {
     case ui::TextEditCommand::DELETE_BACKWARD:
     case ui::TextEditCommand::DELETE_FORWARD:
     case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE:
     case ui::TextEditCommand::DELETE_TO_BEGINNING_OF_PARAGRAPH:
@@ skipping 599 matching lines @@
 }
 
 void Textfield::OnCursorBlinkTimerFired() {
   DCHECK(ShouldBlinkCursor());
   gfx::RenderText* render_text = GetRenderText();
   render_text->set_cursor_visible(!render_text->cursor_visible());
   RepaintCursor();
 }
 
 }  // namespace views