Separate Virtual Keyboard related conditionals from TouchUI

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 568 matching lines @@
 
   // Bookmark manager.
   component_extensions.push_back(std::make_pair(
       FILE_PATH_LITERAL("bookmark_manager"),
       IDR_BOOKMARKS_MANIFEST));
 
 #if defined(FILE_MANAGER_EXTENSION)
   AddFileManagerExtension(&component_extensions);
 #endif
 
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
   component_extensions.push_back(std::make_pair(
       FILE_PATH_LITERAL("keyboard"),
       IDR_KEYBOARD_MANIFEST));
 #endif
 
 #if defined(OS_CHROMEOS)
     component_extensions.push_back(std::make_pair(
         FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"),
         IDR_MOBILE_MANIFEST));
 
@@ skipping 1180 matching lines @@
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile());
   return spellcheck_profile_.get();
 }
 
 void ProfileImpl::SetDownloadManagerDelegate(
     ChromeDownloadManagerDelegate* delegate) {
   download_manager_delegate_ = delegate;
 }