summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/base/ime/DEPS (renamed from views/ime/DEPS)0
-rw-r--r--ui/base/ime/character_composer.cc (renamed from views/ime/character_composer.cc)11
-rw-r--r--ui/base/ime/character_composer.h (renamed from views/ime/character_composer.h)10
-rw-r--r--ui/base/ime/character_composer_unittest.cc (renamed from views/ime/character_composer_unittest.cc)6
-rw-r--r--ui/ui.gyp8
-rw-r--r--ui/ui_unittests.gypi6
-rw-r--r--views/ime/input_method_ibus.h4
-rw-r--r--views/views.gyp10
8 files changed, 32 insertions, 23 deletions
diff --git a/views/ime/DEPS b/ui/base/ime/DEPS
index fceb080..fceb080 100644
--- a/views/ime/DEPS
+++ b/ui/base/ime/DEPS
diff --git a/views/ime/character_composer.cc b/ui/base/ime/character_composer.cc
index 00546d0..3194967 100644
--- a/views/ime/character_composer.cc
+++ b/ui/base/ime/character_composer.cc
@@ -2,11 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "character_composer.h"
+#include "ui/base/ime/character_composer.h"
#include <algorithm>
#include <iterator>
+// Note for Gtk removal: gdkkeysyms.h only contains a set of
+// '#define GDK_KeyName 0xNNNN' macros and does not #include any Gtk headers.
#include "third_party/gtk+/gdk/gdkkeysyms.h"
#include "ui/base/glib/glib_integers.h"
@@ -264,6 +266,9 @@ int ComposeCheckerWithCompactTable::CompareSequenceSkipFront::operator()(
// global constant and contaminate the global namespace.
#include "third_party/gtk+/gtk/gtkimcontextsimpleseqs.h"
+// Note for Gtk removal: gtkimcontextsimpleseqs.h only contains one big guint16
+// array and does not #include any Gtk headers.
+
// Additional table.
@@ -331,7 +336,7 @@ bool CheckCharacterComposeTable(const ComposeBufferType& sequence,
} // namespace
-namespace views {
+namespace ui {
CharacterComposer::CharacterComposer() {}
@@ -371,4 +376,4 @@ bool CharacterComposer::FilterKeyPress(unsigned int keycode) {
return false;
}
-} // namespace views
+} // namespace ui
diff --git a/views/ime/character_composer.h b/ui/base/ime/character_composer.h
index 291e80a..2634b1c 100644
--- a/views/ime/character_composer.h
+++ b/ui/base/ime/character_composer.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 VIEWS_IME_CHARACTER_COMPOSER_H_
-#define VIEWS_IME_CHARACTER_COMPOSER_H_
+#ifndef UI_BASE_IME_CHARACTER_COMPOSER_H_
+#define UI_BASE_IME_CHARACTER_COMPOSER_H_
#pragma once
#include <vector>
@@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
-namespace views {
+namespace ui {
// A class to recognize compose and dead key sequence.
// Outputs composed character.
@@ -46,6 +46,6 @@ class CharacterComposer {
DISALLOW_COPY_AND_ASSIGN(CharacterComposer);
};
-} // namespace views
+} // namespace ui
-#endif // VIEWS_IME_CHARACTER_COMPOSER_H_
+#endif // UI_BASE_IME_CHARACTER_COMPOSER_H_
diff --git a/views/ime/character_composer_unittest.cc b/ui/base/ime/character_composer_unittest.cc
index 254f180..14eea8f 100644
--- a/views/ime/character_composer_unittest.cc
+++ b/ui/base/ime/character_composer_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/ime/character_composer.h"
+#include "ui/base/ime/character_composer.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/gtk+/gdk/gdkkeysyms.h"
#include "ui/base/glib/glib_integers.h"
-namespace views {
+namespace ui {
namespace {
@@ -193,4 +193,4 @@ TEST(CharacterComposerTest, MainTableIsCorrectlyOrdered) {
}
}
-} // namespace views
+} // namespace ui
diff --git a/ui/ui.gyp b/ui/ui.gyp
index bc5a1ba..6305dae 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -123,6 +123,8 @@
'base/gtk/tooltip_window_gtk.cc',
'base/gtk/tooltip_window_gtk.h',
'base/hit_test.h',
+ 'base/ime/character_composer.cc',
+ 'base/ime/character_composer.h',
'base/ime/composition_text.cc',
'base/ime/composition_text.h',
'base/ime/composition_underline.h',
@@ -421,6 +423,12 @@
['include', 'gfx/linux_util.h'],
],
}],
+ ['use_ibus != 1', {
+ 'sources/': [
+ ['exclude', 'base/ime/character_composer.cc'],
+ ['exclude', 'base/ime/character_composer.h'],
+ ],
+ }],
['OS=="win"', {
'sources': [
'gfx/gdi_util.cc',
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 82d5200..5a4a8c4 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -52,6 +52,7 @@
'base/cocoa/base_view_unittest.mm',
'base/gtk/gtk_expanded_container_unittest.cc',
'base/gtk/gtk_im_context_util_unittest.cc',
+ 'base/ime/character_composer_unittest.cc',
'base/l10n/l10n_util_mac_unittest.mm',
'base/l10n/l10n_util_unittest.cc',
'base/models/tree_node_iterator_unittest.cc',
@@ -169,6 +170,11 @@
'gfx/screen_unittest.cc',
],
}],
+ ['use_ibus != 1', {
+ 'sources/': [
+ ['exclude', 'base/ime/character_composer_unittest.cc'],
+ ],
+ }],
],
},
],
diff --git a/views/ime/input_method_ibus.h b/views/ime/input_method_ibus.h
index 47649b4..67832697 100644
--- a/views/ime/input_method_ibus.h
+++ b/views/ime/input_method_ibus.h
@@ -14,8 +14,8 @@
#include "base/memory/scoped_ptr.h"
#include "ui/base/glib/glib_integers.h"
#include "ui/base/glib/glib_signal.h"
+#include "ui/base/ime/character_composer.h"
#include "views/events/event.h"
-#include "views/ime/character_composer.h"
#include "views/ime/input_method_base.h"
#include "views/view.h"
@@ -199,7 +199,7 @@ class InputMethodIBus : public InputMethodBase {
// An object to compose a character from a sequence of key presses
// including dead key etc.
- CharacterComposer character_composer_;
+ ui::CharacterComposer character_composer_;
DISALLOW_COPY_AND_ASSIGN(InputMethodIBus);
};
diff --git a/views/views.gyp b/views/views.gyp
index 805da08..1e1cf66 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -283,8 +283,6 @@
'focus/view_storage.h',
'focus/widget_focus_manager.cc',
'focus/widget_focus_manager.h',
- 'ime/character_composer.cc',
- 'ime/character_composer.h',
'ime/input_method.h',
'ime/input_method_delegate.h',
'ime/input_method_base.cc',
@@ -523,8 +521,6 @@
],
}, { # else: use_ibus != 1
'sources/': [
- ['exclude', 'ime/character_composer.cc'],
- ['exclude', 'ime/character_composer.h'],
['exclude', 'ime/input_method_ibus.cc'],
['exclude', 'ime/input_method_ibus.h'],
],
@@ -590,7 +586,6 @@
'events/event_unittest.cc',
'focus/accelerator_handler_gtk_unittest.cc',
'focus/focus_manager_unittest.cc',
- 'ime/character_composer_unittest.cc',
'layout/grid_layout_unittest.cc',
'layout/box_layout_unittest.cc',
'test/views_test_base.cc',
@@ -648,11 +643,6 @@
'../third_party/wtl/include',
],
}],
- ['use_ibus!=1', {
- 'sources/': [
- ['exclude', 'ime/character_composer_unittest.cc'],
- ],
- }],
[ 'use_aura==1', {
'dependencies': [
'../ui/aura/aura.gyp:test_support_aura',
generated by cgit v1.1 at 2025-03-11 03:47:58 +0000