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

Unified Diff: chrome/browser/ui/touch/frame/touch_browser_frame_view.cc

Issue 5847004: Fix layout of the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser
Patch Set: Created 10 years 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 | « chrome/browser/ui/touch/frame/touch_browser_frame_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
diff --git a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
index d3c960ee48a3c3f2e796aae03c4f110ebf762c7a..39ae5237ef268278aa778e84696da286f8143b2c 100644
--- a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
+++ b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
@@ -43,6 +43,17 @@ TouchBrowserFrameView::TouchBrowserFrameView(BrowserFrame* frame,
TouchBrowserFrameView::~TouchBrowserFrameView() {
}
+void TouchBrowserFrameView::Layout() {
+ OpaqueBrowserFrameView::Layout();
+
+ if (!keyboard_)
+ return;
+
+ keyboard_->SetBounds(GetBoundsForReservedArea());
+ keyboard_->SetVisible(keyboard_showing_);
+ keyboard_->Layout();
+}
+
///////////////////////////////////////////////////////////////////////////////
// TouchBrowserFrameView, protected:
int TouchBrowserFrameView::GetReservedHeight() const {
@@ -84,9 +95,6 @@ void TouchBrowserFrameView::UpdateKeyboardAndLayout(bool should_show_keyboard) {
keyboard_showing_ = should_show_keyboard;
- keyboard_->SetBounds(GetBoundsForReservedArea());
- keyboard_->SetVisible(should_show_keyboard);
-
// Because the NonClientFrameView is a sibling of the ClientView, we rely on
// the parent to resize the ClientView instead of resizing it directly.
GetParent()->Layout();
« no previous file with comments | « chrome/browser/ui/touch/frame/touch_browser_frame_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698