summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 04:25:37 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 04:25:37 +0000
commitcf99f3b5cdc644528028cd472dc80fe1e3de33f7 (patch)
treef3242950f0b5588eafa0eac2981604057e01dfc6 /chrome
parentdb9733a4c17531bf3ac08ee53faf9d04784427b9 (diff)
downloadchromium_src-cf99f3b5cdc644528028cd472dc80fe1e3de33f7.zip
chromium_src-cf99f3b5cdc644528028cd472dc80fe1e3de33f7.tar.gz
chromium_src-cf99f3b5cdc644528028cd472dc80fe1e3de33f7.tar.bz2
Use USE_VIRTUAL_KEYBOARD instead of TOUCH_UI when loading virtual keyboard component extension
Use correct definition introduced in http://codereview.chromium.org/8051010 BUG=None TEST=None Review URL: http://codereview.chromium.org/8566002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/component_loader.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 25fcd27..624befa 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -149,7 +149,7 @@ void ComponentLoader::AddDefaultComponentExtensions() {
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));