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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/public/test/content_browser_test.cc

Issue 284323002: ozone: Remove InputMethodContextFactoryOzone and FakeInputMethodContextOzone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 7 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 | ui/base/ime/input_method_factory.cc » ('j') | ui/ozone/platform/dri/dri.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/content_browser_test.cc
diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc
index 8d26969a52465a6feacd415f30d59435a92a84b0..29c881577c92e87e8076e279017ac135fed90de2 100644
--- a/content/public/test/content_browser_test.cc
+++ b/content/public/test/content_browser_test.cc
@@ -29,7 +29,7 @@
#include "base/mac/scoped_nsautorelease_pool.h"
#endif
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(USE_X11)
+#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
#include "ui/base/ime/input_method_initializer.h"
#endif
@@ -91,7 +91,7 @@ void ContentBrowserTest::SetUp() {
#endif
// LinuxInputMethodContextFactory has to be initialized.
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(USE_X11)
+#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
ui::InitializeInputMethodForTesting();
#endif
« no previous file with comments | « no previous file | ui/base/ime/input_method_factory.cc » ('j') | ui/ozone/platform/dri/dri.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698