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

Unified Diff: chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.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: chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
diff --git a/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc b/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
index a59c5120b1d73a7b953062ca9ba8cb921fefbd85..814408ba4d8209565b1928f42b0ffd8bf8905f64 100644
--- a/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
@@ -19,7 +19,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
#include "extensions/common/extension.h"
-#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/base/ime/input_method.h"
#include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_switches.h"
@@ -86,8 +86,7 @@ void VirtualKeyboardBrowserTest::RunTest(
void VirtualKeyboardBrowserTest::ShowVirtualKeyboard() {
aura::Window* window = ash::Shell::GetPrimaryRootWindow();
- ui::InputMethod* input_method =
- window->GetProperty(aura::client::kRootWindowInputMethodKey);
+ ui::InputMethod* input_method = window->GetHost()->GetInputMethod();
ASSERT_TRUE(input_method);
input_method->ShowImeIfNeeded();
}

Powered by Google App Engine
This is Rietveld 408576698