Separate Virtual Keyboard related conditionals from TouchUI

chrome/browser/chromeos/login/webui_login_view.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/chromeos/login/webui_login_view.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/render_view_host_observer.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "views/desktop/desktop_window_view.h"
 #include "views/widget/native_widget_gtk.h"
 #include "views/widget/widget.h"
 
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
 #endif
 
 namespace {
 
 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView";
 
 // These strings must be kept in sync with handleAccelerator() in oobe.js.
 const char kAccelNameAccessibility[] = "accessibility";
 const char kAccelNameCancel[] = "cancel";
@@ skipping 60 matching lines @@
 const int WebUILoginView::kStatusAreaCornerPadding = 5;
 
 // WebUILoginView public: ------------------------------------------------------
 
 WebUILoginView::WebUILoginView()
     : status_area_(NULL),
       webui_login_(NULL),
       status_window_(NULL),
       host_window_frozen_(false),
       status_area_visibility_on_init_(true) {
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
   // Make sure the singleton VirtualKeyboardManager object is created.
   VirtualKeyboardManager::GetInstance();
 #endif
   accel_map_[views::Accelerator(ui::VKEY_Z, false, true, true)] =
       kAccelNameAccessibility;
   accel_map_[views::Accelerator(ui::VKEY_ESCAPE, false, false, false)] =
       kAccelNameCancel;
   accel_map_[views::Accelerator(ui::VKEY_E, false, true, true)] =
       kAccelNameEnrollment;
 
@@ skipping 262 matching lines @@
                                                         GetFocusManager());
 
   // Make sure error bubble is cleared on keyboard event. This is needed
   // when the focus is inside an iframe.
   WebUI* web_ui = GetWebUI();
   if (web_ui)
     web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
 }
 
 }  // namespace chromeos