Index: ui/keyboard/keyboard_controller.cc |
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc |
index 00a3b1bd58d63b84eda8f2b6e10fec50ba9574c2..c3d82959c809d36ca629185d9806321bf50815cf 100644 |
--- a/ui/keyboard/keyboard_controller.cc |
+++ b/ui/keyboard/keyboard_controller.cc |
@@ -27,7 +27,8 @@ namespace { |
const int kHideKeyboardDelayMs = 100; |
gfx::Rect KeyboardBoundsFromWindowBounds(const gfx::Rect& window_bounds) { |
- const float kKeyboardHeightRatio = 0.3f; |
+ const float kKeyboardHeightRatio = |
+ keyboard::IsKeyboardUsabilityTestEnabled() ? 1.0f : 0.3f; |
return gfx::Rect( |
window_bounds.x(), |
window_bounds.y() + window_bounds.height() * (1 - kKeyboardHeightRatio), |
@@ -202,7 +203,8 @@ void KeyboardController::OnTextInputStateChanged( |
container_->AddChild(keyboard); |
container_->layout_manager()->OnWindowResized(); |
} |
- proxy_->SetUpdateInputType(type); |
+ if (!type == ui::TEXT_INPUT_TYPE_NONE) |
sadrul
2013/10/30 20:58:27
type != ...
bshe
2013/10/31 16:45:44
Done.
|
+ proxy_->SetUpdateInputType(type); |
container_->parent()->StackChildAtTop(container_.get()); |
should_show = true; |
} |