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

Unified Diff: ash/magnifier/magnification_controller_unittest.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bot failure: cast_shell_linux 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: ash/magnifier/magnification_controller_unittest.cc
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc
index c36a9d6bfe89a452d1c9a402c0155a49cb52c59a..aeb89dfc4d35db845aa2be9a72122c61ea7987f5 100644
--- a/ash/magnifier/magnification_controller_unittest.cc
+++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -9,7 +9,6 @@
#include "ash/test/ash_test_base.h"
#include "ash/test/display_manager_test_api.h"
#include "base/strings/stringprintf.h"
-#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
#include "ui/aura/test/aura_test_utils.h"
#include "ui/aura/window_tree_host.h"
@@ -150,10 +149,7 @@ class MagnificationControllerTest: public test::AshTestBase {
ui::InputMethod* GetInputMethod() {
DCHECK(text_input_view_);
- return text_input_view_->GetWidget()
- ->GetNativeWindow()
- ->GetRootWindow()
- ->GetProperty(aura::client::kRootWindowInputMethodKey);
+ return text_input_view_->GetWidget()->GetHostInputMethod();
}
DISALLOW_COPY_AND_ASSIGN(MagnificationControllerTest);

Powered by Google App Engine
This is Rietveld 408576698