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

Unified Diff: ui/keyboard/keyboard_util.cc

Issue 574033003: Remove keyboard usability mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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
« ui/keyboard/keyboard_controller.cc ('K') | « ui/keyboard/keyboard_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_util.cc
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index 188aa73fb398f147e197ecfcc1c2ab46bff3efa1..ec305cfb8ccf5237172cbf95e1c7662dd0a1ffcf 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -59,13 +59,8 @@ gfx::Rect DefaultKeyboardBoundsFromWindowBounds(
// Initialize default keyboard height to 0. The keyboard window height should
// only be set by window.resizeTo in virtual keyboard web contents. Otherwise,
// the default height may conflict with the new height and causing some
- // strange animation issues. For keyboard usability experiments, a full screen
- // virtual keyboard window is always preferred.
- int keyboard_height =
- keyboard::IsKeyboardUsabilityExperimentEnabled() ?
- window_bounds.height() : 0;
-
- return KeyboardBoundsFromWindowBounds(window_bounds, keyboard_height);
+ // strange animation issues.
+ return KeyboardBoundsFromWindowBounds(window_bounds, 0);
}
gfx::Rect KeyboardBoundsFromWindowBounds(const gfx::Rect& window_bounds,
@@ -109,16 +104,10 @@ bool IsKeyboardEnabled() {
// Check if any of the flags are enabled.
return CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableVirtualKeyboard) ||
- IsKeyboardUsabilityExperimentEnabled() ||
g_touch_keyboard_enabled ||
(g_keyboard_show_override == keyboard::KEYBOARD_SHOW_OVERRIDE_ENABLED);
}
-bool IsKeyboardUsabilityExperimentEnabled() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kKeyboardUsabilityExperiment);
-}
-
bool IsKeyboardOverscrollEnabled() {
if (!IsKeyboardEnabled())
return false;
« ui/keyboard/keyboard_controller.cc ('K') | « ui/keyboard/keyboard_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698