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/memory/ptr_util.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"
 #include "ui/gfx/selection_bound.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/focus_ring.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/native_cursor.h"
 #include "ui/views/painter.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/coordinate_conversion.h"
+#include "ui/wm/core/ime_util.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "ui/base/win/osk_display_manager.h"
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/linux/text_edit_command_auralinux.h"
 #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
@@ skipping 1413 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::EnsureCaretNotInRect(const gfx::Rect& rect) {}
+void Textfield::EnsureCaretNotInRect(const gfx::Rect& rect_in_screen) {
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVirtualKeyboardBehavior))
+    return;
+
+  aura::Window* top_level_window = GetNativeView()->GetToplevelWindow();
+  gfx::Rect original_window_bounds = top_level_window->GetBoundsInScreen();
+  if (top_level_window->GetProperty(
+          aura::client::kVirtualKeyboardRestoreBoundsKey)) {
+    original_window_bounds = *top_level_window->GetProperty(
+        aura::client::kVirtualKeyboardRestoreBoundsKey);
+  }
+
+  gfx::Rect hidden_window_bounds_in_screen =
+      gfx::IntersectRects(rect_in_screen, original_window_bounds);
+  if (hidden_window_bounds_in_screen.IsEmpty()) {
+    // The window isn't covered by the keyboard, restore the window position if
+    // necessary.
+    OnClientFocusLost();
+    return;
+  }
+
+  if (wm::MoveWindowToEnsureCaretNotInRect(top_level_window, rect_in_screen)) {
+    // Recalculate hidden_window_bounds_in_screen after moving up the window
+    original_window_bounds = top_level_window->GetBoundsInScreen();
+    hidden_window_bounds_in_screen =
+        gfx::IntersectRects(rect_in_screen, original_window_bounds);
+  } else {
+    // No need to move the window or need to restore the window position.
+    OnClientFocusLost();
+  }
+#endif  // defined(OS_CHROMEOS)
+}
+
+void Textfield::OnClientFocusLost() {
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVirtualKeyboardBehavior))
+    return;
+
+  aura::Window* top_level_window = GetNativeView()->GetToplevelWindow();
+  DCHECK(top_level_window);
+  wm::RestoreWindowBoundsOnClientFocusLost(top_level_window);
+#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 600 matching lines @@
   cursor_blink_timer_.Stop();
 }
 
 void Textfield::OnCursorBlinkTimerFired() {
   DCHECK(ShouldBlinkCursor());
   cursor_view_.SetVisible(!cursor_view_.visible());
   UpdateCursorViewPosition();
 }
 
 }  // namespace views