Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(828)

Unified Diff: ui/views/test/views_test_base.cc

Issue 13235003: Support the Text services framework based IME for Chrome AURA on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/test/views_test_base.cc
===================================================================
--- ui/views/test/views_test_base.cc (revision 193425)
+++ ui/views/test/views_test_base.cc (working copy)
@@ -13,8 +13,17 @@
#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 views {
+#if defined(OS_WIN)
+bool ViewsTestBase::tsf_initialized_ = false;
+#endif
+
ViewsTestBase::ViewsTestBase()
: setup_called_(false),
teardown_called_(false) {
@@ -36,6 +45,12 @@
aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
aura_test_helper_->SetUp();
#endif // USE_AURA
+#if defined(OS_WIN)
+ if (base::win::IsTSFAwareRequired() && !tsf_initialized_) {
+ tsf_initialized_ = true;
+ ui::TSFBridge::Initialize();
+ }
+#endif
}
void ViewsTestBase::TearDown() {

Powered by Google App Engine
This is Rietveld 408576698