Make GetRootWindow() return a Window instead of a RootWindow.

ui/keyboard/keyboard_ui_handler.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/keyboard/keyboard_ui_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 36 matching lines @@
                  base::Unretained(this)));
 }
 
 void KeyboardUIHandler::HandleInsertTextMessage(const base::ListValue* args) {
   string16 text;
   if (!args->GetString(0, &text)) {
     LOG(ERROR) << "insertText failed: bad argument";
     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";
     return;
   }
 
   if (!keyboard::InsertText(text, root_window))
     LOG(ERROR) << "insertText failed";
 }
 
 void KeyboardUIHandler::HandleGetInputContextMessage(
     const base::ListValue* args) {
   int request_id;
   if (!args->GetInteger(0, &request_id)) {
     LOG(ERROR) << "getInputContext failed: bad argument";
     return;
   }
   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";
     return;
   }
   ui::InputMethod* input_method =
       root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
   if (!input_method) {
     LOG(ERROR) << "getInputContext failed: no input method";
     return;
@@ skipping 17 matching lines @@
 
   if (!args->GetDictionary(0, &params) ||
       !params->GetString("type", &type) ||
       !params->GetInteger("charValue", &char_value) ||
       !params->GetInteger("keyCode", &key_code) ||
       !params->GetBoolean("shiftKey", &shift_modifier)) {
     LOG(ERROR) << "SendKeyEvent failed: bad argument";
     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;
   }
 
   if (!keyboard::SendKeyEvent(type,
                               char_value,
                               key_code,
                               shift_modifier,
-                              root_window)) {
+                              dispatcher)) {
     LOG(ERROR) << "sendKeyEvent failed";
   }
 }
 
 void KeyboardUIHandler::HandleHideKeyboard(const base::ListValue* args) {
   // TODO(stevet): Call into the keyboard controller to hide the keyboard
   // directly.
   NOTIMPLEMENTED();
   return;
 }
 
 }  // namespace keyboard