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

chrome/browser/ui/ash/event_rewriter.cc

 // Copyright (c) 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/ui/ash/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/logging.h"
@@ skipping 152 matching lines @@
 
 EventRewriter::EventRewriter()
     : last_device_id_(kBadDeviceId),
 #if defined(OS_CHROMEOS)
       xkeyboard_(NULL),
       keyboard_driven_event_rewritter_(
           new chromeos::KeyboardDrivenEventRewriter),
 #endif
       pref_service_(NULL) {
   // The ash shell isn't instantiated for our unit tests.
-  if (ash::Shell::HasInstance())
-    ash::Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);
+  if (ash::Shell::HasInstance()) {
+    ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->
+        AddRootWindowObserver(this);
+  }
 #if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     chromeos::XInputHierarchyChangedEventListener::GetInstance()
         ->AddObserver(this);
   }
   RefreshKeycodes();
 #endif
 }
 
 EventRewriter::~EventRewriter() {
-  if (ash::Shell::HasInstance())
-    ash::Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);
+  if (ash::Shell::HasInstance()) {
+    ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->
+        RemoveRootWindowObserver(this);
+  }
 #if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     chromeos::XInputHierarchyChangedEventListener::GetInstance()
         ->RemoveObserver(this);
   }
 #endif
 }
 
 EventRewriter::DeviceType EventRewriter::DeviceAddedForTesting(
     int device_id,
@@ skipping 849 matching lines @@
   const DeviceType type = EventRewriter::GetDeviceType(device_name);
   if (type == kDeviceAppleKeyboard) {
     VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
             << "id=" << device_id;
   }
   // Always overwrite the existing device_id since the X server may reuse a
   // device id for an unattached device.
   device_id_to_type_[device_id] = type;
   return type;
 }