[Input View] Makes the input view window support window.resizeTo() and w3c visibility API its web c…

ui/keyboard/keyboard_controller_proxy.cc

 // Copyright (c) 2013 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 "ui/keyboard/keyboard_controller_proxy.h"
 
 #include "base/values.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 53 matching lines @@
   // Overridden from content::WebContentsDelegate:
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) OVERRIDE {
     source->GetController().LoadURL(
         params.url, params.referrer, params.transition, params.extra_headers);
     Observe(source);
     return source;
   }
 
+  virtual bool IsPopupOrPanel(const content::WebContents* source) const {
+    return true;
+  }
+
+  virtual void MoveContents(
+      content::WebContents* source, const gfx::Rect& pos) {

[kevers, 2013/12/03 00:08:12]

OVERRIDE

[Shu Chen, 2013/12/03 01:54:42]

Done.

+    aura::Window* keyboard = proxy_->GetKeyboardWindow();
+    gfx::Rect bounds = keyboard->bounds();
+    int new_height = pos.height();
+    bounds.set_y(bounds.y() + bounds.height() - new_height);
+    bounds.set_height(new_height);
+    // Records the keyboard new height. So that GetHitTestMask() can set the
+    // same keyboard bounds as the hit test mask.
+    keyboard::KeyboardControllerProxy::keyboard_height = new_height;
+
+    keyboard::KeyboardControllerProxy::keyboard_resizing_from_contents = true;

[kevers, 2013/12/03 00:08:12]

Can set a non-static member and add a public accessor method.

[Shu Chen, 2013/12/03 01:54:42]

Done.

+    keyboard->SetBounds(bounds);
+    keyboard::KeyboardControllerProxy::keyboard_resizing_from_contents = false;

[kevers, 2013/12/03 00:08:12]

Resetting might not be strictly required.  See other notes.

[Shu Chen, 2013/12/03 01:54:42]

Done.

+  }
+
   // Overridden from content::WebContentsDelegate:
   virtual void RequestMediaAccessPermission(content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) OVERRIDE {
     proxy_->RequestAudioInput(web_contents, request, callback);
   }
 
 
   // Overridden from content::WebContentsObserver:
   virtual void WebContentsDestroyed(content::WebContents* contents) OVERRIDE {
     delete this;
   }
 
   keyboard::KeyboardControllerProxy* proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardContentsDelegate);
 };
 
 }  // namespace
 
 namespace keyboard {
 
+int KeyboardControllerProxy::keyboard_height = -1;
+
+bool KeyboardControllerProxy::keyboard_resizing_from_contents = false;
+
 KeyboardControllerProxy::KeyboardControllerProxy()
     : default_url_(kKeyboardWebUIURL) {
 }
 
 KeyboardControllerProxy::~KeyboardControllerProxy() {
 }
 
 const GURL& KeyboardControllerProxy::GetValidUrl() {
   return override_url_.is_valid() ? override_url_ : default_url_;
 }
@@ skipping 26 matching lines @@
             content::SiteInstance::CreateForURL(context, GetValidUrl()))));
     keyboard_contents_->SetDelegate(new KeyboardContentsDelegate(this));
     SetupWebContents(keyboard_contents_.get());
     ReloadContents();
   }
 
   return keyboard_contents_->GetView()->GetNativeView();
 }
 
 void KeyboardControllerProxy::ShowKeyboardContainer(aura::Window* container) {
+  GetKeyboardWindow()->Show();
   container->Show();
 }
 
 void KeyboardControllerProxy::HideKeyboardContainer(aura::Window* container) {
   container->Hide();
+  GetKeyboardWindow()->Hide();
 }
 
 void KeyboardControllerProxy::SetUpdateInputType(ui::TextInputType type) {
   content::WebUI* webui = keyboard_contents_ ?
       keyboard_contents_->GetCommittedWebUI() : NULL;
 
   if (webui &&
       (0 != (webui->GetBindings() & content::BINDINGS_POLICY_WEB_UI))) {
     // Only call OnTextInputBoxFocused function if it is a web ui keyboard,
     // not an extension based keyboard.
     base::DictionaryValue input_context;
     input_context.SetString("type", TextInputTypeToString(type));
     webui->CallJavascriptFunction("OnTextInputBoxFocused", input_context);
   }
 }
 
 void KeyboardControllerProxy::SetupWebContents(content::WebContents* contents) {
 }
 
 }  // namespace keyboard