summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 19:05:54 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 19:05:54 +0000
commit8fc73401637bca32a20489a50ad11b9fbaeb7e0f (patch)
tree9966213cdd2b8907574f63891331453850796d95 /chrome/test
parentfccce900f1ae529a923c224b4f3b52bddc993267 (diff)
downloadchromium_src-8fc73401637bca32a20489a50ad11b9fbaeb7e0f.zip
chromium_src-8fc73401637bca32a20489a50ad11b9fbaeb7e0f.tar.gz
chromium_src-8fc73401637bca32a20489a50ad11b9fbaeb7e0f.tar.bz2
Support the Text services framework based IME for Chrome AURA on Windows 8 and above
and enable it by default for Chrome AURA. This change should not affect non AURA Chrome. The changes in this CL are mostly around setting the focused TextInputClient in the TSFBridgeDelegate class and not handling the traditional IME messages apart from WM_IME_SETCONTEXT in the input method win subclass. I also made a change in the TSFBridge class to ensure that Initialize can be called multiple times. ASH support will come in a subsequent change. Needs some more research there. Known issues:- 1. Clicking on the omnibox in Chrome AURA switches the current language setting back to ENG regardless of the last active language. We have to switch back to the desired lang each time on the omnibox. This works fine on the web page though. yukawa? do you have any ideas as to why? 2. Chinese IME's when used on the web page in Chrome AURA display the composition window at the top left corner of the desktop. This works correctly on the omnibox. yukawa? perhaps you may know. The views_test_base.h/.cc changes are needed for views unittests to pass The desktop_notifications_unittest.cc/.h and view_event_test_base.cc/.h changes are needed for interactive_ui_tests to pass. The ash_test_base.cc/.h changes are needed for ash_unittests to pass. BUG=225189 TBR=nona Review URL: https://codereview.chromium.org/13235003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/base/view_event_test_base.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 91b1855..6b0bbe5 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -34,6 +34,11 @@
#include "ui/aura/test/aura_test_helper.h"
#endif
+#if defined(OS_WIN)
+#include "base/win/metro.h"
+#include "ui/base/ime/win/tsf_bridge.h"
+#endif
+
namespace {
// View subclass that allows you to specify the preferred size.
@@ -117,7 +122,10 @@ void ViewEventTestBase::SetUp() {
aura_test_helper_->SetUp();
context = aura_test_helper_->root_window();
#endif
-
+#if defined(OS_WIN)
+ if (base::win::IsTSFAwareRequired())
+ ui::TSFBridge::Initialize();
+#endif
window_ = views::Widget::CreateWindowWithContext(this, context);
}