Separate Virtual Keyboard related conditionals from TouchUI

chrome/common/extensions/extension.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/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 2024 matching lines @@
       return false;
     }
 
     // Validate that the overrides are all strings
     for (DictionaryValue::key_iterator iter = overrides->begin_keys();
          iter != overrides->end_keys(); ++iter) {
       std::string page = *iter;
       std::string val;
       // Restrict override pages to a list of supported URLs.
       if ((page != chrome::kChromeUINewTabHost &&
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
            page != chrome::kChromeUIKeyboardHost &&
 #endif
 #if defined(OS_CHROMEOS)
            page != chrome::kChromeUIActivationMessageHost &&
 #endif
            page != chrome::kChromeUIBookmarksHost &&
            page != chrome::kChromeUIHistoryHost
 #if defined(FILE_MANAGER_EXTENSION)
                &&
            !(location() ==  COMPONENT &&
@@ skipping 917 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}