Move keyboard_engine_xkb to wayland/input/

keyboard_engine_xkb has dependencies on XKB and is used by wayland/. This patch moves keyboard_engine_xkb to wayland and removes wayland/ dependency on ime/
kalyankondapally · Feb 24, 2014 · 2f86f49 · 2f86f49 · tiagovignatti · Feb 24, 2014
1 parent f34b308
commit 2f86f49
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/ui/ime/ime.gypi b/ui/ime/ime.gypi
@@ -10,7 +10,5 @@
     'input_method_context_factory_wayland.cc',
     'input_method_context_impl_wayland.h',
     'input_method_context_impl_wayland.cc',
-    'keyboard_engine_xkb.h',
-    'keyboard_engine_xkb.cc',
   ],
 }
diff --git a/wayland/input/keyboard.cc b/wayland/input/keyboard.cc
@@ -5,7 +5,7 @@
 #include "ozone/wayland/input/keyboard.h"
 
 #include "ozone/ui/events/event_converter_ozone_wayland.h"
-#include "ozone/ui/ime/keyboard_engine_xkb.h"
+#include "ozone/wayland/input/keyboard_engine_xkb.h"
 
 namespace ozonewayland {
 

diff --git a/ui/ime/keyboard_engine_xkb.cc → wayland/input/keyboard_engine_xkb.cc b/ui/ime/keyboard_engine_xkb.cc → wayland/input/keyboard_engine_xkb.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ozone/ui/ime/keyboard_engine_xkb.h"
+#include "ozone/wayland/input/keyboard_engine_xkb.h"
 
 #include <sys/mman.h>
 

diff --git a/ui/ime/keyboard_engine_xkb.h → wayland/input/keyboard_engine_xkb.h b/ui/ime/keyboard_engine_xkb.h → wayland/input/keyboard_engine_xkb.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef OZONE_UI_IME_KEYBOARD_ENGINE_XKB_H_
-#define OZONE_UI_IME_KEYBOARD_ENGINE_XKB_H_
+#ifndef OZONE_WAYLAND_INPUT_KEYBOARD_ENGINE_XKB_H_
+#define OZONE_WAYLAND_INPUT_KEYBOARD_ENGINE_XKB_H_
 
 #include <xkbcommon/xkbcommon.h>
 
@@ -53,4 +53,4 @@ class KeyboardEngineXKB {
 
 }  // namespace ozonewayland
 
-#endif  // OZONE_UI_IME_KEYBOARD_ENGINE_XKB_H_
+#endif  // OZONE_WAYLAND_INPUT_KEYBOARD_ENGINE_XKB_H_
diff --git a/wayland/wayland.gyp b/wayland/wayland.gyp
@@ -50,9 +50,6 @@
       'include_dirs': [
         '../..',
       ],
-      'includes': [
-        '../ui/ime/ime.gypi',
-      ],
       'sources': [
         'display.cc',
         'display.h',
@@ -74,6 +71,8 @@
         'input/cursor.h',
         'input/keyboard.cc',
         'input/keyboard.h',
+        'input/keyboard_engine_xkb.h',
+        'input/keyboard_engine_xkb.cc',
         'input/pointer.cc',
         'input/pointer.h',
       ],