Fix layout of the virtual keyboard.

chrome/browser/ui/touch/frame/touch_browser_frame_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/touch/frame/touch_browser_frame_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
@@ skipping 25 matching lines @@
                  NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::FOCUS_CHANGED_IN_PAGE,
                  NotificationService::AllSources());
 }
 
 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 {
   if (keyboard_showing_)
     return kKeyboardHeight;
 
   return 0;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 21 matching lines @@
   if (should_show_keyboard)
     InitVirtualKeyboard();
 
   if (should_show_keyboard == keyboard_showing_)
     return;
 
   DCHECK(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();
 }
 
 void TouchBrowserFrameView::Observe(NotificationType type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   Browser* browser = browser_view()->browser();
   if (type == NotificationType::FOCUS_CHANGED_IN_PAGE) {
     // Only modify the keyboard state if the notification is coming from
     // a source within the same Browser.
     Source<RenderViewHost> specific_source(source);
     for (int i = 0; i < browser->tab_count(); ++i) {
       if (browser->GetTabContentsAt(i)->render_view_host() ==
           specific_source.ptr()) {
         UpdateKeyboardAndLayout(*Details<const bool>(details).ptr());
         break;
       }
     }
   } else if (type == NotificationType::NAV_ENTRY_COMMITTED) {
     Browser* source_browser = Browser::GetBrowserForController(
         Source<NavigationController>(source).ptr(), NULL);
     // If the Browser for the keyboard has navigated, hide the keyboard.
     if (source_browser == browser) {
       UpdateKeyboardAndLayout(false);
     }
   }
 }