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

Unified Diff: ash/test/ash_test_base.h

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 | « no previous file | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.h
===================================================================
--- ash/test/ash_test_base.h (revision 194055)
+++ ash/test/ash_test_base.h (working copy)
@@ -17,6 +17,7 @@
#if defined(OS_WIN)
#include "base/memory/scoped_ptr.h"
+#include "ui/base/win/scoped_ole_initializer.h"
#endif
namespace aura {
@@ -112,6 +113,7 @@
scoped_ptr<aura::test::EventGenerator> event_generator_;
#if defined(OS_WIN)
scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_;
+ ui::ScopedOleInitializer ole_initializer_;
#endif
scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
« no previous file with comments | « no previous file | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698