Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

Unified Diff: ui/keyboard/keyboard_controller.cc

Issue 47873003: Add a full screen virtual keyboard to virtual keyboard root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/keyboard/keyboard_controller.cc
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index 00a3b1bd58d63b84eda8f2b6e10fec50ba9574c2..537cf12b9f7b37b673de5565bdfbcadac60ea9bf 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -27,7 +27,8 @@ namespace {
const int kHideKeyboardDelayMs = 100;
gfx::Rect KeyboardBoundsFromWindowBounds(const gfx::Rect& window_bounds) {
- const float kKeyboardHeightRatio = 0.3f;
+ const float kKeyboardHeightRatio =
+ keyboard::IsKeyboardUsabilityExperimentEnabled() ? 1.0f : 0.3f;
return gfx::Rect(
window_bounds.x(),
window_bounds.y() + window_bounds.height() * (1 - kKeyboardHeightRatio),
@@ -191,8 +192,7 @@ void KeyboardController::OnTextInputStateChanged(
ui::TextInputType type =
client ? client->GetTextInputType() : ui::TEXT_INPUT_TYPE_NONE;
if (type == ui::TEXT_INPUT_TYPE_NONE &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kKeyboardUsabilityTest)) {
+ !IsKeyboardUsabilityExperimentEnabled()) {
should_show = false;
} else {
if (container_->children().empty()) {
@@ -202,7 +202,8 @@ void KeyboardController::OnTextInputStateChanged(
container_->AddChild(keyboard);
container_->layout_manager()->OnWindowResized();
}
- proxy_->SetUpdateInputType(type);
+ if (type != ui::TEXT_INPUT_TYPE_NONE)
+ proxy_->SetUpdateInputType(type);
container_->parent()->StackChildAtTop(container_.get());
should_show = true;
}
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | ui/keyboard/keyboard_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698