diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 20:15:11 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 20:15:11 +0000 |
| commit | 72851a9a7d4f40ae41d26ac1a94f02544ac495be (patch) | |
| tree | aea8cfff380bddcee0d454b6fc92a1313c3704ac | |
| parent | e669d390b07cb4657ececa81979e55c295c09448 (diff) | |
| download | chromium_src-72851a9a7d4f40ae41d26ac1a94f02544ac495be.zip chromium_src-72851a9a7d4f40ae41d26ac1a94f02544ac495be.tar.gz chromium_src-72851a9a7d4f40ae41d26ac1a94f02544ac495be.tar.bz2 | |
Change TOUCH_UI => USE_VIRTUAL_KEYBOARD.
BUG=105046
TEST=manually
Review URL: http://codereview.chromium.org/8652001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112008 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager.cc b/chrome/browser/chromeos/input_method/input_method_manager.cc index ac8a99d..8f014f8 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager.cc @@ -30,7 +30,7 @@ #include "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" -#if !defined(TOUCH_UI) +#if !defined(USE_VIRTUAL_KEYBOARD) #include "chrome/browser/chromeos/input_method/candidate_window.h" #endif @@ -944,7 +944,7 @@ class InputMethodManagerImpl : public HotkeyManager::Observer, } void UpdateVirtualKeyboardUI() { -#if defined(TOUCH_UI) +#if defined(USE_VIRTUAL_KEYBOARD) const VirtualKeyboard* virtual_keyboard = NULL; std::string virtual_keyboard_layout = ""; @@ -1011,7 +1011,7 @@ class InputMethodManagerImpl : public HotkeyManager::Observer, *virtual_keyboard, virtual_keyboard_layout)); } -#endif // TOUCH_UI +#endif // USE_VIRTUAL_KEYBOARD } // Changes the current input method from the given input method ID. @@ -1099,7 +1099,7 @@ class InputMethodManagerImpl : public HotkeyManager::Observer, return false; } -#if !defined(TOUCH_UI) +#if !defined(USE_VIRTUAL_KEYBOARD) if (!candidate_window_controller_.get()) { candidate_window_controller_.reset(new CandidateWindowController); if (!candidate_window_controller_->Init()) { @@ -1177,7 +1177,7 @@ class InputMethodManagerImpl : public HotkeyManager::Observer, shutting_down_ = true; notification_registrar_.RemoveAll(); StopInputMethodDaemon(); -#if !defined(TOUCH_UI) +#if !defined(USE_VIRTUAL_KEYBOARD) candidate_window_controller_.reset(NULL); #endif } @@ -1344,7 +1344,7 @@ class InputMethodManagerImpl : public HotkeyManager::Observer, // The candidate window. This will be deleted when the APP_TERMINATING // message is sent. -#if !defined(TOUCH_UI) +#if !defined(USE_VIRTUAL_KEYBOARD) scoped_ptr<CandidateWindowController> candidate_window_controller_; #endif |