| Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| index 87ee275d354b0c58e840da23fed57026dc133883..455e2e0a5f9068dfda5272dc15b5dc461248235c 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| @@ -75,6 +75,7 @@
|
| #include "ui/aura/window_event_dispatcher.h"
|
| #include "ui/aura/window_observer.h"
|
| #include "ui/base/clipboard/clipboard.h"
|
| +#include "ui/base/ui_base_switches.h"
|
| #include "ui/base/ui_base_types.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/compositor/layer_tree_owner.h"
|
| @@ -93,6 +94,10 @@
|
| #include "ui/wm/core/default_screen_position_client.h"
|
| #include "ui/wm/core/window_util.h"
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "ui/base/ime/input_method.h"
|
| +#endif
|
| +
|
| using testing::_;
|
|
|
| using blink::WebGestureEvent;
|
| @@ -3797,6 +3802,49 @@ TEST_F(RenderWidgetHostViewAuraOverscrollTest, OverscrollResetsOnBlur) {
|
| EXPECT_EQ(3U, sink_->message_count());
|
| }
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +// Check that when accessibility virtual keyboard is enabled, windows are
|
| +// shifted up when focused and restored when focus is lost.
|
| +TEST_F(RenderWidgetHostViewAuraOverscrollTest,
|
| + VirtualKeyboardFocusEnsureCaretInRect) {
|
| + SetUpOverscrollEnvironment();
|
| + // TODO (oshima): Test that overscroll occurs.
|
| +
|
| + // Enable new virtual keyboard behavior.
|
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| + if (!command_line->HasSwitch(::switches::kUseNewVirtualKeyboardBehavior)) {
|
| + command_line->AppendSwitch(::switches::kUseNewVirtualKeyboardBehavior);
|
| + }
|
| +
|
| + aura::Window* root_window = parent_view_->GetNativeView()->GetRootWindow();
|
| + ui::InputMethod* input_method = root_window->GetHost()->GetInputMethod();
|
| + int keyboard_height = 200;
|
| + gfx::Rect root_bounds = root_window->bounds();
|
| + gfx::Rect root_bounds_with_keyboard = gfx::Rect(
|
| + root_bounds.origin(),
|
| + gfx::Size(root_bounds.width(), root_bounds.height() - keyboard_height));
|
| + gfx::Rect orig_view_bounds = gfx::Rect(0, 300, 400, 200);
|
| + gfx::Rect shifted_view_bounds = gfx::Rect(0, 200, 400, 200);
|
| +
|
| + // Focus the window.
|
| + view_->SetBounds(orig_view_bounds);
|
| + input_method->SetFocusedTextInputClient(view_);
|
| + EXPECT_EQ(view_->GetNativeView()->bounds(), orig_view_bounds);
|
| +
|
| + // Simulate virtual keyboard.
|
| + input_method->SetAvailableBounds(root_bounds_with_keyboard);
|
| +
|
| + // Window should be shifted.
|
| + EXPECT_EQ(view_->GetNativeView()->bounds(), shifted_view_bounds);
|
| +
|
| + // Change the focus.
|
| + input_method->SetFocusedTextInputClient(nullptr);
|
| +
|
| + // Window should be restored.
|
| + EXPECT_EQ(view_->GetNativeView()->bounds(), orig_view_bounds);
|
| +}
|
| +#endif
|
| +
|
| // Tests that when view initiated shutdown happens (i.e. RWHView is deleted
|
| // before RWH), we clean up properly and don't leak the RWHVGuest.
|
| TEST_F(RenderWidgetHostViewGuestAuraTest, GuestViewDoesNotLeak) {
|
|
|