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

Unified Diff: ui/keyboard/keyboard_ui_handler.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 | « ui/aura/window.cc ('k') | ui/keyboard/keyboard_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_ui_handler.cc
diff --git a/ui/keyboard/keyboard_ui_handler.cc b/ui/keyboard/keyboard_ui_handler.cc
index 26909c2d49ee20d6def07a787d85d3ff4193447f..560c37e50f9be9627cc387d90611b5289a54888d 100644
--- a/ui/keyboard/keyboard_ui_handler.cc
+++ b/ui/keyboard/keyboard_ui_handler.cc
@@ -54,7 +54,7 @@ void KeyboardUIHandler::HandleInsertTextMessage(const base::ListValue* args) {
return;
}
- aura::RootWindow* root_window =
+ aura::Window* root_window =
web_ui()->GetWebContents()->GetView()->GetNativeView()->GetRootWindow();
if (!root_window) {
LOG(ERROR) << "insertText failed: no root window";
@@ -75,7 +75,7 @@ void KeyboardUIHandler::HandleGetInputContextMessage(
base::DictionaryValue results;
results.SetInteger("requestId", request_id);
- aura::RootWindow* root_window =
+ aura::Window* root_window =
web_ui()->GetWebContents()->GetView()->GetNativeView()->GetRootWindow();
if (!root_window) {
LOG(ERROR) << "getInputContext failed: no root window";
@@ -113,10 +113,10 @@ void KeyboardUIHandler::HandleSendKeyEventMessage(
return;
}
- aura::RootWindow* root_window =
- web_ui()->GetWebContents()->GetView()->GetNativeView()->GetRootWindow();
- if (!root_window) {
- LOG(ERROR) << "sendKeyEvent failed: no root window";
+ aura::WindowEventDispatcher* dispatcher =
+ web_ui()->GetWebContents()->GetView()->GetNativeView()->GetDispatcher();
+ if (!dispatcher) {
+ LOG(ERROR) << "sendKeyEvent failed: no dispatcher";
return;
}
@@ -124,7 +124,7 @@ void KeyboardUIHandler::HandleSendKeyEventMessage(
char_value,
key_code,
shift_modifier,
- root_window)) {
+ dispatcher)) {
LOG(ERROR) << "sendKeyEvent failed";
}
}
« no previous file with comments | « ui/aura/window.cc ('k') | ui/keyboard/keyboard_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698