Commit e93ae7a4 authored by Blake O'Hare's avatar Blake O'Hare Committed by Commit Bot

Rename IsSmartVirtualKeyboardEnabled to IsVirtualKeyboardEnabled

Bug: 736925
Change-Id: Ib50980632c779f3ba9ffc01474f8a0009cc06763
Reviewed-on: https://chromium-review.googlesource.com/566159Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Reviewed-by: default avatarKeigo Oka <oka@chromium.org>
Commit-Queue: Blake O'Hare <blakeo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487354}
parent 0599a736
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
namespace ash { namespace ash {
namespace { namespace {
// Checks whether smart deployment is enabled. // Checks if virtual keyboard is force-enabled by enable-virtual-keyboard flag.
bool IsSmartVirtualKeyboardEnabled() { bool IsVirtualKeyboardEnabled() {
return !base::CommandLine::ForCurrentProcess()->HasSwitch( return !base::CommandLine::ForCurrentProcess()->HasSwitch(
keyboard::switches::kEnableVirtualKeyboard); keyboard::switches::kEnableVirtualKeyboard);
} }
...@@ -80,7 +80,7 @@ VirtualKeyboardController::~VirtualKeyboardController() { ...@@ -80,7 +80,7 @@ VirtualKeyboardController::~VirtualKeyboardController() {
} }
void VirtualKeyboardController::OnMaximizeModeStarted() { void VirtualKeyboardController::OnMaximizeModeStarted() {
if (!IsSmartVirtualKeyboardEnabled()) { if (!IsVirtualKeyboardEnabled()) {
SetKeyboardEnabled(true); SetKeyboardEnabled(true);
} else { } else {
UpdateKeyboardEnabled(); UpdateKeyboardEnabled();
...@@ -88,7 +88,7 @@ void VirtualKeyboardController::OnMaximizeModeStarted() { ...@@ -88,7 +88,7 @@ void VirtualKeyboardController::OnMaximizeModeStarted() {
} }
void VirtualKeyboardController::OnMaximizeModeEnded() { void VirtualKeyboardController::OnMaximizeModeEnded() {
if (!IsSmartVirtualKeyboardEnabled()) { if (!IsVirtualKeyboardEnabled()) {
SetKeyboardEnabled(false); SetKeyboardEnabled(false);
} else { } else {
UpdateKeyboardEnabled(); UpdateKeyboardEnabled();
...@@ -185,7 +185,7 @@ void VirtualKeyboardController::UpdateDevices() { ...@@ -185,7 +185,7 @@ void VirtualKeyboardController::UpdateDevices() {
} }
void VirtualKeyboardController::UpdateKeyboardEnabled() { void VirtualKeyboardController::UpdateKeyboardEnabled() {
if (!IsSmartVirtualKeyboardEnabled()) { if (!IsVirtualKeyboardEnabled()) {
SetKeyboardEnabled(Shell::Get() SetKeyboardEnabled(Shell::Get()
->maximize_mode_controller() ->maximize_mode_controller()
->IsMaximizeModeWindowManagerEnabled()); ->IsMaximizeModeWindowManagerEnabled());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment