Replace multi-value keyboard flags with single value flag types.

ui/keyboard/keyboard_util.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/keyboard/keyboard_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 147 matching lines @@
 
 void SetKeyboardOverscrollOverride(KeyboardOverscrolOverride override) {
   g_keyboard_overscroll_override = override;
 }
 
 void SetKeyboardShowOverride(KeyboardShowOverride override) {
   g_keyboard_show_override = override;
 }
 
 bool IsInputViewEnabled() {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableInputView))
-    return true;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableInputView))
-    return false;
-  // Default value if no command line flags specified.
-  return true;
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableInputView);
 }
 
 bool IsExperimentalInputViewEnabled() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableExperimentalInputViewFeatures);
 }
 
 bool IsFloatingVirtualKeyboardEnabled() {
-  std::string floating_virtual_keyboard_switch =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kFloatingVirtualKeyboard);
-  return floating_virtual_keyboard_switch ==
-      switches::kFloatingVirtualKeyboardEnabled;
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableFloatingVirtualKeyboard);
 }
 
 bool IsGestureTypingEnabled() {
-  return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-      switches::kGestureTyping) != switches::kGestureTypingDisabled;
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableGestureTyping);
 }
 
 bool IsGestureEditingEnabled() {
-  std::string keyboard_switch =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kGestureEditing);
-  return keyboard_switch != switches::kGestureEditingDisabled;
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableGestureEditing);
 }
 
 bool IsSmartDeployEnabled() {
-  std::string keyboard_switch =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kSmartVirtualKeyboard);
-  return keyboard_switch != switches::kSmartVirtualKeyboardDisabled;
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableSmartVirtualKeyboard);
 }
 
 bool IsVoiceInputEnabled() {
   return media::AudioManager::Get()->HasAudioInputDevices() &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableVoiceInput);
 }
 
 bool InsertText(const base::string16& text) {
   keyboard::KeyboardController* controller = KeyboardController::GetInstance();
@@ skipping 168 matching lines @@
 }
 
 void LogKeyboardControlEvent(KeyboardControlEvent event) {
   UMA_HISTOGRAM_ENUMERATION(
       "VirtualKeyboard.KeyboardControlEvent",
       event,
       keyboard::KEYBOARD_CONTROL_MAX);
 }
 
 }  // namespace keyboard