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

Unified Diff: ui/keyboard/keyboard_controller.cc

Issue 1138873003: Restore virtual keyboard after switch back to FULL_WIDTH mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test Created 5 years, 7 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 | « no previous file | ui/keyboard/keyboard_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_controller.cc
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index b34d42756339cea462020550b63038bc0bd8c947..a085c533a2d376cf50ec8b2d1f821aff77c33450 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -343,8 +343,16 @@ void KeyboardController::SetKeyboardMode(KeyboardMode mode) {
if (keyboard_mode_ == FLOATING) {
NotifyKeyboardBoundsChanging(gfx::Rect());
} else if (keyboard_mode_ == FULL_WIDTH) {
- // TODO(bshe): handle switch to FULL_WIDTH from FLOATING mode. We need a way
- // to know the height of virtual keyboard in FULL_WIDTH mode before here.
+ // TODO(bshe): revisit this logic after we decide to support resize virtual
+ // keyboard.
+ int keyboard_height = GetContainerWindow()->bounds().height();
+ const gfx::Rect& root_bounds = container_->GetRootWindow()->bounds();
+ gfx::Rect new_bounds = root_bounds;
+ new_bounds.set_y(root_bounds.height() - keyboard_height);
+ new_bounds.set_height(keyboard_height);
+ GetContainerWindow()->SetBounds(new_bounds);
+ // No animation added, so call ShowAnimationFinished immediately.
+ ShowAnimationFinished();
}
}
« no previous file with comments | « no previous file | ui/keyboard/keyboard_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698