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

Unified Diff: chrome/browser/chromeos/input_method/textinput_test_helper.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed. Created 5 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
Index: chrome/browser/chromeos/input_method/textinput_test_helper.cc
diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.cc b/chrome/browser/chromeos/input_method/textinput_test_helper.cc
index b4c601a439e7029b382f32a689225e2edae585bb..07bedca65f42cc640175a77973602d833bc258d2 100644
--- a/chrome/browser/chromeos/input_method/textinput_test_helper.cc
+++ b/chrome/browser/chromeos/input_method/textinput_test_helper.cc
@@ -12,16 +12,15 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
-#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/base/ime/input_method_factory.h"
namespace chromeos {
namespace {
ui::MockInputMethod* GetInputMethod() {
ui::MockInputMethod* input_method = static_cast<ui::MockInputMethod*>(
- ash::Shell::GetPrimaryRootWindow()->GetProperty(
- aura::client::kRootWindowInputMethodKey));
+ ash::Shell::GetPrimaryRootWindow()->GetHost()->GetInputMethod());
CHECK(input_method);
return input_method;
}

Powered by Google App Engine
This is Rietveld 408576698