diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 21:54:14 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 21:54:14 +0000 |
| commit | 9a2aebe07c306db09211e25eee66553668638de5 (patch) | |
| tree | 30338da1aa7d4a12062dd61dd2e1781b5aeb8d29 /chrome/browser/extensions/extension_input_api.cc | |
| parent | 6a33d38fc59f3363275f2274c03ab1a7f6aca39f (diff) | |
| download | chromium_src-9a2aebe07c306db09211e25eee66553668638de5.zip chromium_src-9a2aebe07c306db09211e25eee66553668638de5.tar.gz chromium_src-9a2aebe07c306db09211e25eee66553668638de5.tar.bz2 | |
Move functions out of TOUCH_UI defines.
BUG=105046
TEST=manually
Review URL: http://codereview.chromium.org/8651001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_input_api.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_input_api.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index 5359696..41eadf4 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -23,7 +23,7 @@ #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" @@ -74,7 +74,7 @@ uint16 UnicodeIdentifierStringToInt(const std::string& key_identifier) { } 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) @@ -187,7 +187,7 @@ bool SetKeyboardHeightFunction::RunImpl() { } #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. |