Two fixes for 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"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/rect.h"
 
 namespace {
 
 const int kKeyboardHeight = 300;
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // TouchBrowserFrameView, public:
 
 TouchBrowserFrameView::TouchBrowserFrameView(BrowserFrame* frame,
                                              BrowserView* browser_view)
     : OpaqueBrowserFrameView(frame, browser_view),
+      keyboard_showing_(false),
       keyboard_(NULL) {
   registrar_.Add(this,
                  NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::FOCUS_CHANGED_IN_PAGE,
                  NotificationService::AllSources());
 }
 
 TouchBrowserFrameView::~TouchBrowserFrameView() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TouchBrowserFrameView, protected:
 int TouchBrowserFrameView::GetReservedHeight() const {
-  if (keyboard_ && keyboard_->IsVisible()) {
+  if (keyboard_showing_)
     return kKeyboardHeight;
-  }
+
   return 0;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TouchBrowserFrameView, private:
 
 void TouchBrowserFrameView::InitVirtualKeyboard() {
   if (keyboard_)
     return;
 
   keyboard_ = new DOMView;
 
   Profile* keyboard_profile = browser_view()->browser()->profile();
   DCHECK(keyboard_profile) << "Profile required for virtual keyboard.";
 
   GURL keyboard_url(chrome::kChromeUIKeyboardURL);
   keyboard_->Init(keyboard_profile,
       SiteInstance::CreateSiteInstanceForURL(keyboard_profile, keyboard_url));
   keyboard_->LoadURL(keyboard_url);
 
   keyboard_->SetVisible(false);
   AddChildView(keyboard_);
 }
 
 void TouchBrowserFrameView::UpdateKeyboardAndLayout(bool should_show_keyboard) {
   if (should_show_keyboard)
     InitVirtualKeyboard();
 
   // Don't do any extra work until we have shown the keyboard.
   if (!keyboard_)

[sky, 2010/12/15 17:05:33]

Why do we need this check?

[bryeung, 2010/12/15 18:02:01]

As discussed in the other CL, if we want to be ignoring all calls to this
function before the first time the keyboard is shown.  This check combined with
the if above that conditionally initializes the keyboard accomplish this.

[sky, 2010/12/15 18:11:49]

In that case won't should_show_keyboard_ == keyboard_showing_, and you do
nothing?

     return;
 
   if (should_show_keyboard == keyboard_->IsVisible())

[sky, 2010/12/15 17:05:33]

Shouldn't this be keyboard_showing_ ?

[bryeung, 2010/12/15 18:02:01]

I thought it would be better to rely on the actual View for this, but maybe it
is better for everything to use the same check.

Fixed.

     return;
 
+  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 properly resize the ClientView.
+  // 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.
-    Browser* browser = browser_view()->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 {
-    DCHECK(type == NotificationType::NAV_ENTRY_COMMITTED);
-
-    // TODO(bryeung): this is hiding the keyboard for the very first page
-    //   load after browser startup when the page has an input element focused
-    //   to start with.  It would be nice to fix, but not critical.
-
-    // Everything else we have registered for should hide the keyboard.
-    UpdateKeyboardAndLayout(false);
+  } 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);
+    }
   }
 }