Window ownership -> WindowTreeHost

chrome/browser/chromeos/events/event_rewriter.cc

 // Copyright 2014 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/chromeos/events/event_rewriter.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 #include <X11/Xlib.h>
@@ skipping 125 matching lines @@
 
 namespace chromeos {
 
 EventRewriter::EventRewriter()
     : last_device_id_(kBadDeviceId),
       xkeyboard_for_testing_(NULL),
       keyboard_driven_event_rewriter_(new KeyboardDrivenEventRewriter),
       pref_service_for_testing_(NULL) {
   // The ash shell isn't instantiated for our unit tests.
   if (ash::Shell::HasInstance()) {
-    ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->
+    ash::Shell::GetPrimaryRootWindow()->GetHost()->dispatcher()->
         AddRootWindowObserver(this);
   }
   base::MessageLoopForUI::current()->AddObserver(this);
   if (base::SysInfo::IsRunningOnChromeOS()) {
     XInputHierarchyChangedEventListener::GetInstance()->AddObserver(this);
   }
   RefreshKeycodes();
 }
 
 EventRewriter::~EventRewriter() {
   base::MessageLoopForUI::current()->RemoveObserver(this);
   if (ash::Shell::HasInstance()) {
-    ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->
+    ash::Shell::GetPrimaryRootWindow()->GetHost()->dispatcher()->
         RemoveRootWindowObserver(this);
   }
   if (base::SysInfo::IsRunningOnChromeOS()) {
     XInputHierarchyChangedEventListener::GetInstance()->RemoveObserver(this);
   }
 }
 
 EventRewriter::DeviceType EventRewriter::DeviceAddedForTesting(
     int device_id,
     const std::string& device_name) {
@@ skipping 729 matching lines @@
     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;
 }
 
 }  // namespace chromeos