Move functions out of TOUCH_UI defines.

chrome/browser/extensions/extension_input_api.cc

 // Copyright (c) 2011 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/extension_input_api.h"
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/key_identifier_conversion_views.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "ui/views/events/event.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/widget/widget.h"
 #include "views/views_delegate.h"
 
 #if defined(USE_VIRTUAL_KEYBOARD)
 #include "content/public/browser/notification_service.h"
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #endif
 
 namespace {
 
 // Keys.
 const char kType[] = "type";
 const char kKeyIdentifier[] = "keyIdentifier";
@@ skipping 30 matching lines @@
       (key_identifier.substr(2).find_first_not_of("0123456789abcdefABCDEF") ==
        std::string::npos)) {
     const bool result =
         base::HexStringToInt(key_identifier.substr(2), &character);
     DCHECK(result) << key_identifier;
   }
   return character;
 }
 
 views::Widget* GetTopLevelWidget(Browser* browser) {
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
   chromeos::LoginDisplayHost* host =
       chromeos::BaseLoginDisplayHost::default_host();
   if (host)
     return views::Widget::GetWidgetForNativeWindow(host->GetNativeWindow());
 #endif
 
   if (!browser)
     return NULL;
 
   BrowserWindow* window = browser->window();
@@ skipping 92 matching lines @@
   // and set the height of virtual keyboard directly instead of using
   // notification.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SET_KEYBOARD_HEIGHT_INVOKED,
       content::Source<SetKeyboardHeightFunction>(this),
       content::Details<int>(&height));
   return true;
 }
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
 // TODO(yusukes): This part should be moved to extension_input_api_chromeos.cc.
 bool SendHandwritingStrokeFunction::RunImpl() {
   // TODO(yusukes): Add a parameter for an input context ID.
   ListValue* value = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetList(0, &value));
 
   chromeos::input_method::HandwritingStroke stroke;
   for (size_t i = 0; i < value->GetSize(); ++i) {
     DictionaryValue* dict;
     double x = 0.0;
@@ skipping 28 matching lines @@
   int stroke_count = 0;  // zero means 'clear all strokes'.
   if (HasOptionalArgument(0)) {
     EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &stroke_count));
     EXTENSION_FUNCTION_VALIDATE(stroke_count >= 0);
   }
   chromeos::input_method::InputMethodManager::GetInstance()->
       CancelHandwritingStrokes(stroke_count);
   return true;
 }
 #endif