summaryrefslogtreecommitdiffstats
path: root/ui/keyboard/keyboard_controller_proxy.cc
diff options
context:
space:
mode:
authorshuchen@chromium.org <shuchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 18:53:18 +0000
committershuchen@chromium.org <shuchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 18:53:18 +0000
commite05d48b1af28f67331d4a5f969c8fea84e56aae4 (patch)
tree880233ddf188eb8cf1e489854a75ce39012e6e51 /ui/keyboard/keyboard_controller_proxy.cc
parent86a3377a51b7a4f9bf38438165a2aaccdb2ba34a (diff)
downloadchromium_src-e05d48b1af28f67331d4a5f969c8fea84e56aae4.zip
chromium_src-e05d48b1af28f67331d4a5f969c8fea84e56aae4.tar.gz
chromium_src-e05d48b1af28f67331d4a5f969c8fea84e56aae4.tar.bz2
[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
Diffstat (limited to 'ui/keyboard/keyboard_controller_proxy.cc')
-rw-r--r--ui/keyboard/keyboard_controller_proxy.cc6
1 files changed, 6 insertions, 0 deletions
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();
}