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

chrome/browser/extensions/api/input/input.cc

 // Copyright 2012 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 "chrome/browser/extensions/api/input/input.h"
 
 #include "ash/root_window_controller.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
@@ skipping 38 matching lines @@
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       keyboard::switches::kEnableSwipeSelection)) {
     return false;
   }
 
   int swipe_direction;
   int modifier_flags;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &swipe_direction));
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(1, &modifier_flags));
 
-  return keyboard::MoveCursor(swipe_direction, modifier_flags,
-                              ash::Shell::GetPrimaryRootWindow());
+  return keyboard::MoveCursor(
+      swipe_direction,
+      modifier_flags,
+      ash::Shell::GetPrimaryRootWindow()->GetDispatcher());
 #endif
   error_ = kNotYetImplementedError;
   return false;
 }
 
 bool VirtualKeyboardPrivateSendKeyEventFunction::RunImpl() {
 #if defined(USE_ASH)
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   base::Value* options_value = NULL;
   base::DictionaryValue* params = NULL;
   std::string type;
   int char_value;
   int key_code;
   bool shift_modifier;
 
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &options_value));
   EXTENSION_FUNCTION_VALIDATE(options_value->GetAsDictionary(&params));
   EXTENSION_FUNCTION_VALIDATE(params->GetString("type", &type));
   EXTENSION_FUNCTION_VALIDATE(params->GetInteger("charValue", &char_value));
   EXTENSION_FUNCTION_VALIDATE(params->GetInteger("keyCode", &key_code));
   EXTENSION_FUNCTION_VALIDATE(params->GetBoolean("shiftKey", &shift_modifier));
 
-  return keyboard::SendKeyEvent(type,
-                                char_value,
-                                key_code,
-                                shift_modifier,
-                                ash::Shell::GetPrimaryRootWindow());
+  return keyboard::SendKeyEvent(
+      type,
+      char_value,
+      key_code,
+      shift_modifier,
+      ash::Shell::GetPrimaryRootWindow()->GetDispatcher());
 #endif
   error_ = kNotYetImplementedError;
   return false;
 }
 
 bool VirtualKeyboardPrivateHideKeyboardFunction::RunImpl() {
 #if defined(USE_ASH)
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   UMA_HISTOGRAM_ENUMERATION(
@@ skipping 20 matching lines @@
 
 static base::LazyInstance<ProfileKeyedAPIFactory<InputAPI> >
 g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 ProfileKeyedAPIFactory<InputAPI>* InputAPI::GetFactoryInstance() {
   return &g_factory.Get();
 }
 
 }  // namespace extensions