From e05d48b1af28f67331d4a5f969c8fea84e56aae4 Mon Sep 17 00:00:00 2001 From: "shuchen@chromium.org" Date: Fri, 13 Dec 2013 18:53:18 +0000 Subject: [Input View] Restores the keyboard size to default when switching to default keyboard url. BUG=316524 TEST=Locally verified in sandbox. Review URL: https://codereview.chromium.org/98203011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240708 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/keyboard/keyboard_controller_proxy.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ui/keyboard/keyboard_controller_proxy.cc') diff --git a/ui/keyboard/keyboard_controller_proxy.cc b/ui/keyboard/keyboard_controller_proxy.cc index b36b433..fb6f04d 100644 --- a/ui/keyboard/keyboard_controller_proxy.cc +++ b/ui/keyboard/keyboard_controller_proxy.cc @@ -13,6 +13,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" #include "content/public/common/bindings_policy.h" +#include "ui/aura/layout_manager.h" #include "ui/aura/window.h" #include "ui/keyboard/keyboard_constants.h" @@ -124,7 +125,12 @@ const GURL& KeyboardControllerProxy::GetValidUrl() { void KeyboardControllerProxy::SetOverrideContentUrl(const GURL& url) { if (override_url_ == url) return; + override_url_ = url; + // Restores the keyboard window size to default. + aura::Window* container = GetKeyboardWindow()->parent(); + CHECK(container); + container->layout_manager()->OnWindowResized(); ReloadContents(); } -- cgit v1.1