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

Unified Diff: ui/keyboard/keyboard_util.cc

Issue 2444443002: cros: Allow pin keyboard to keep focus without popping up the pin keyboard. (Closed)
Patch Set: Moved blocking variable to scoped class. Created 4 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
« no previous file with comments | « ui/keyboard/BUILD.gn ('k') | ui/keyboard/scoped_keyboard_disabler.h » ('j') | 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 23404bc4f155d85673ef558ca67bc66e42c278fb..3523f0dcd1af48fc0dc49b8f6bcb0440f552163f 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -25,6 +25,7 @@
#include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_switches.h"
#include "ui/keyboard/keyboard_ui.h"
+#include "ui/keyboard/scoped_keyboard_disabler.h"
namespace {
@@ -111,6 +112,9 @@ std::string GetKeyboardLayout() {
}
bool IsKeyboardEnabled() {
+ // Blocks keyboard from showing up regardless of other settings.
+ if (ScopedKeyboardDisabler::GetForceDisableVirtualKeyboard())
+ return false;
// Accessibility setting prioritized over policy setting.
if (g_accessibility_keyboard_enabled)
return true;
« no previous file with comments | « ui/keyboard/BUILD.gn ('k') | ui/keyboard/scoped_keyboard_disabler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698