Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 195793004: Implement overscroll support for the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add unit test. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 81137d9eeba78ff21a5e049618c72b4acd5282bb..1c58c55dd564fc96577b545634ab3d1da0d8446c 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
@@ -5,6 +5,7 @@
#include "content/browser/renderer_host/render_widget_host_view_aura.h"
#include "base/basictypes.h"
+#include "base/command_line.h"
#include "base/memory/shared_memory.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
@@ -45,6 +46,8 @@
#include "ui/compositor/test/in_process_context_factory.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
+#include "ui/keyboard/keyboard_switches.h"
+#include "ui/keyboard/keyboard_util.h"
using testing::_;
@@ -1344,4 +1347,54 @@ TEST_F(RenderWidgetHostViewAuraCopyRequestTest, DestroyedAfterCopyRequest) {
EXPECT_FALSE(result_);
}
+#if defined(OS_CHROMEOS)
+
+class RenderWidgetHostViewAuraKeyboardTest
+ : public RenderWidgetHostViewAuraTest {
+ public:
+ RenderWidgetHostViewAuraKeyboardTest() {}
+
+ virtual void SetUp() {
sadrul 2014/04/15 16:26:43 OVERRIDE
kevers 2014/04/15 17:26:44 Done.
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+ command_line->AppendSwitch(
+ keyboard::switches::kEnableVirtualKeyboard);
+ command_line->AppendSwitch(
+ keyboard::switches::kEnableVirtualKeyboardOverscroll);
+ RenderWidgetHostViewAuraTest::SetUp();
+ }
+};
+
+TEST_F(RenderWidgetHostViewAuraKeyboardTest, OverscrollTest) {
+ gfx::Rect view_rect(100, 100);
+
+ view_->InitAsChild(NULL);
+ aura::client::ParentWindowWithContext(
+ view_->GetNativeView(),
+ parent_view_->GetNativeView()->GetRootWindow(),
+ gfx::Rect());
+ view_->SetSize(view_rect.size());
+ view_->WasShown();
+
+ EXPECT_TRUE(keyboard::IsKeyboardOverscrollEnabled());
+ EXPECT_EQ("0,0 0x0", view_->virtual_keyboard_bounds_.ToString());
+
+ widget_host_->ResetSizeAndRepaintPendingFlags();
+ sink_->ClearMessages();
+ gfx::Rect keyboard_rect(0, 50, 100, 50);
+ view_->OnKeyboardBoundsChanging(keyboard_rect);
+
+ EXPECT_EQ("0,50 100x50", view_->virtual_keyboard_bounds_.ToString());
+ EXPECT_EQ(50, view_->GetOverdrawBottomHeight());
+
+ const IPC::Message *message = sink_->GetFirstMessageMatching(
+ ViewMsg_Resize::ID);
+ ASSERT_TRUE(message != NULL);
+
+ ViewMsg_Resize::Param params;
+ ViewMsg_Resize::Read(message, &params);
+ EXPECT_EQ(50, params.a.overdraw_bottom_height);
+}
+
+#endif // defined(OS_CHROMEOS)
+
} // namespace content
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698