Merge gesture deletion and selection.

chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc

 // Copyright 2014 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 "chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 46 matching lines @@
     base::DictionaryValue* results) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   results->SetString("layout", keyboard::GetKeyboardLayout());
   results->SetBoolean("a11ymode", keyboard::GetAccessibilityKeyboardEnabled());
   scoped_ptr<base::ListValue> features(new base::ListValue());
   features->AppendString(GenerateFeatureFlag(
       "floatingvirtualkeyboard", keyboard::IsFloatingVirtualKeyboardEnabled()));
   features->AppendString(
       GenerateFeatureFlag("gesturetyping", keyboard::IsGestureTypingEnabled()));
   features->AppendString(GenerateFeatureFlag(
-      "gestureselection", keyboard::IsGestureSelectionEnabled()));
-  features->AppendString(GenerateFeatureFlag(
-      "gesturedeletion", keyboard::IsGestureDeletionEnabled()));
+      "gestureediting", keyboard::IsGestureEditingEnabled()));
   features->AppendString(GenerateFeatureFlag(
       "materialdesign", keyboard::IsMaterialDesignEnabled()));
   features->AppendString(
       GenerateFeatureFlag("voiceinput", keyboard::IsVoiceInputEnabled()));
   features->AppendString(GenerateFeatureFlag("experimental",
       keyboard::IsExperimentalInputViewEnabled()));
   results->Set("features", features.Pass());
   return true;
 }
 
@@ skipping 85 matching lines @@
 }
 
 bool ChromeVirtualKeyboardDelegate::IsLanguageSettingsEnabled() {
   return (user_manager::UserManager::Get()->IsUserLoggedIn() &&
           !chromeos::UserAddingScreen::Get()->IsRunning() &&
           !(chromeos::ScreenLocker::default_screen_locker() &&
             chromeos::ScreenLocker::default_screen_locker()->locked()));
 }
 
 }  // namespace extensions