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

Unified Diff: ui/aura/test/aura_test_helper.cc

Issue 16024014: Move DummyInputMethod into ui/base/ime/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 6 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/dummy_input_method.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_helper.cc
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index 7e6a867dbba95e034285e21ba89754d6a4e26ef2..0cd07044c19a12ddba2975cf864eaecebe57b7f5 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -15,7 +15,7 @@
#include "ui/aura/test/test_activation_client.h"
#include "ui/aura/test/test_screen.h"
#include "ui/aura/test/test_stacking_client.h"
-#include "ui/base/test/dummy_input_method.h"
+#include "ui/base/ime/dummy_input_method.h"
#include "ui/compositor/layer_animator.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/gfx/screen.h"
@@ -62,7 +62,7 @@ void AuraTestHelper::SetUp() {
test_activation_client_.reset(
new test::TestActivationClient(root_window_.get()));
capture_client_.reset(new client::DefaultCaptureClient(root_window_.get()));
- test_input_method_.reset(new ui::test::DummyInputMethod);
+ test_input_method_.reset(new ui::DummyInputMethod);
root_window_->SetProperty(
client::kRootWindowInputMethodKey,
test_input_method_.get());
« no previous file with comments | « no previous file | ui/base/ime/dummy_input_method.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698