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

Unified Diff: ash/wm/workspace/workspace_layout_manager_unittest.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: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 7e2fe9b5fe2f1f7f2bb6789cf39e3d5452582363..84a22519cd4273eb8099660be50b49ca446a7f11 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -1020,8 +1020,7 @@ class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase {
} else {
aura::Window* root_window =
ash::Shell::GetInstance()->GetPrimaryRootWindow();
- ui::InputMethod* input_method =
- root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
+ ui::InputMethod* input_method = root_window->GetHost()->GetInputMethod();
input_method->SetFocusedTextInputClient(text_input_client);
}
}
@@ -1033,8 +1032,7 @@ class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase {
} else {
aura::Window* root_window =
ash::Shell::GetInstance()->GetPrimaryRootWindow();
- ui::InputMethod* input_method =
- root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
+ ui::InputMethod* input_method = root_window->GetHost()->GetInputMethod();
input_method->SetFocusedTextInputClient(NULL);
}
}

Powered by Google App Engine
This is Rietveld 408576698