Window ownership -> WindowTreeHost

ui/views/widget/desktop_aura/desktop_screen_position_client.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 "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
 
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 namespace views {
 
 namespace {
 
 gfx::Point GetOrigin(const aura::Window* root_window) {
   gfx::Point origin_in_pixels =
-      root_window->GetDispatcher()->host()->GetBounds().origin();
+      root_window->GetHost()->GetBounds().origin();
   aura::Window* window = const_cast<aura::Window*>(root_window);
   float scale = gfx::Screen::GetScreenFor(window)->
        GetDisplayNearestWindow(window).device_scale_factor();
   return gfx::ToFlooredPoint(
       gfx::ScalePoint(origin_in_pixels, 1 / scale));
 }
 
 // Returns true if bounds passed to window are treated as though they are in
 // screen coordinates.
 bool PositionWindowInScreenCoordinates(aura::Window* window) {
   if (window->type() == ui::wm::WINDOW_TYPE_POPUP ||
       window->type() == ui::wm::WINDOW_TYPE_TOOLTIP)
     return true;
 
   Widget* widget = Widget::GetWidgetForNativeView(window);
   return widget && widget->is_top_level();
 }
 
 }  // namespace
 
-DesktopScreenPositionClient::DesktopScreenPositionClient() {
+DesktopScreenPositionClient::DesktopScreenPositionClient(
+    aura::Window* root_window) : root_window_(root_window) {
+  aura::client::SetScreenPositionClient(root_window_, this);
 }
 
 DesktopScreenPositionClient::~DesktopScreenPositionClient() {
+  aura::client::SetScreenPositionClient(root_window_, NULL);
 }
 
 void DesktopScreenPositionClient::ConvertPointToScreen(
     const aura::Window* window, gfx::Point* point) {
   const aura::Window* root_window = window->GetRootWindow();
   aura::Window::ConvertPointToTarget(window, root_window, point);
   gfx::Point origin = GetOrigin(root_window);
   point->Offset(origin.x(), origin.y());
 }
 
@@ skipping 31 matching lines @@
     window->SetBounds(gfx::Rect(origin, bounds.size()));
     return;
   }
 
   internal::NativeWidgetPrivate* desktop_native_widget =
       DesktopNativeWidgetAura::ForWindow(root);
   if (desktop_native_widget &&
       desktop_native_widget->GetNativeView() == window) {
     // |window| is the content_window.
     // Setting bounds of root resizes |window|.
-    root->GetDispatcher()->host()->SetBounds(bounds);
+    root->GetHost()->SetBounds(bounds);
   } else {
     window->SetBounds(bounds);
   }
 }
 
 }  // namespace views