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

Unified Diff: ash/test/ash_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
« no previous file with comments | « ash/test/ash_test_base.h ('k') | base/win/metro.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
===================================================================
--- ash/test/ash_test_base.cc (revision 194055)
+++ ash/test/ash_test_base.cc (working copy)
@@ -1,3 +1,4 @@
+
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -39,9 +40,11 @@
#if defined(OS_WIN)
#include "ash/test/test_metro_viewer_process_host.h"
#include "base/test/test_process_killer_win.h"
+#include "base/win/metro.h"
#include "base/win/windows_version.h"
#include "ui/aura/remote_root_window_host_win.h"
#include "ui/aura/root_window_host_win.h"
+#include "ui/base/ime/win/tsf_bridge.h"
#include "win8/test/test_registrar_constants.h"
#endif
@@ -95,6 +98,8 @@
switches::kAshHostWindowBounds, "1+1-800x600");
#if defined(OS_WIN)
aura::test::SetUsePopupAsRootWindowForTest(true);
+ if (base::win::IsTSFAwareRequired())
+ ui::TSFBridge::Initialize();
#endif
// Disable animations during tests.
zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
« no previous file with comments | « ash/test/ash_test_base.h ('k') | base/win/metro.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698