diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 22:37:32 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 22:37:32 +0000 |
| commit | 3ea7f1be5dfc4233daa3f80f89560499e0075806 (patch) | |
| tree | 7a50e717ebc7f3be2aba82d05679c56c71db994e | |
| parent | 2125cde44a633323dbe924ee09b21c07445f494a (diff) | |
| download | chromium_src-3ea7f1be5dfc4233daa3f80f89560499e0075806.zip chromium_src-3ea7f1be5dfc4233daa3f80f89560499e0075806.tar.gz chromium_src-3ea7f1be5dfc4233daa3f80f89560499e0075806.tar.bz2 | |
Fixes to build chrome under chroot:
1) Added missing headers causing compilation errors
2) Added an #ifdef to prevent the case of a dangling else{} without a preceeding if(){}.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8387005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106997 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | views/ime/input_method_ibus.cc | 2 | ||||
| -rw-r--r-- | views/ime/input_method_ibus.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/views/ime/input_method_ibus.cc b/views/ime/input_method_ibus.cc index 94ee14c..505f14b 100644 --- a/views/ime/input_method_ibus.cc +++ b/views/ime/input_method_ibus.cc @@ -78,6 +78,7 @@ void IBusKeyEventFromViewsKeyEvent(const views::KeyEvent& key, *ibus_keycode = gdk_key->hardware_keycode; } #endif +#if defined(TOUCH_UI) || defined(TOOLKIT_USES_GTK) else { // GdkKeyCodeForWindowsKeyCode() is actually nothing to do with Gtk, we // probably want to rename it to something like XKeySymForWindowsKeyCode(), @@ -86,6 +87,7 @@ void IBusKeyEventFromViewsKeyEvent(const views::KeyEvent& key, key.key_code(), key.IsShiftDown() ^ key.IsCapsLockDown()); *ibus_keycode = 0; } +#endif *ibus_state = IBusStateFromViewsFlags(key.flags()); if (key.type() == ui::ET_KEY_RELEASED) diff --git a/views/ime/input_method_ibus.h b/views/ime/input_method_ibus.h index 2402f6a..b50d6fb 100644 --- a/views/ime/input_method_ibus.h +++ b/views/ime/input_method_ibus.h @@ -12,6 +12,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" +#include "ui/base/gtk/gtk_integers.h" #include "ui/base/gtk/gtk_signal.h" #include "views/events/event.h" #include "views/ime/character_composer.h" @@ -19,6 +20,7 @@ #include "views/view.h" // Forward declarations, so that we don't need to include ibus.h in this file. +typedef struct _GAsyncResult GAsyncResult; typedef struct _IBusBus IBusBus; typedef struct _IBusInputContext IBusInputContext; typedef struct _IBusText IBusText; |