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

Unified Diff: ui/keyboard/keyboard_controller.cc

Issue 34783006: Add --keyboard-usability-test flag and always show keyboard unless manually hide (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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
« no previous file with comments | « no previous file | ui/keyboard/keyboard_switches.h » ('j') | ui/keyboard/keyboard_switches.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_controller.cc
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index 313bc04f0cd77a1df96babfe2e17b852f3f513d2..94eced34866db97af6960bbf6b75dcb80bd5cdb7 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -5,6 +5,7 @@
#include "ui/keyboard/keyboard_controller.h"
#include "base/bind.h"
+#include "base/command_line.h"
#include "ui/aura/layout_manager.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
@@ -18,6 +19,7 @@
#include "ui/gfx/skia_util.h"
#include "ui/keyboard/keyboard_controller_observer.h"
#include "ui/keyboard/keyboard_controller_proxy.h"
+#include "ui/keyboard/keyboard_switches.h"
#include "ui/keyboard/keyboard_util.h"
namespace {
@@ -151,6 +153,11 @@ aura::Window* KeyboardController::GetContainerWindow() {
}
void KeyboardController::HideKeyboard(HideReason reason) {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
kevers 2013/10/23 11:37:39 I think this belongs right before the "keyboard_vi
sadrul 2013/10/23 14:01:49 Agree. It would probably be better to just set |sh
bshe 2013/10/23 17:08:43 I agree with the above and have moved it before th
+ switches::kKeyboardUsabilityTest) && reason == HIDE_REASON_AUTOMATIC) {
+ return;
+ }
+
keyboard_visible_ = false;
keyboard::LogKeyboardControlEvent(
« no previous file with comments | « no previous file | ui/keyboard/keyboard_switches.h » ('j') | ui/keyboard/keyboard_switches.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698