Window ownership -> WindowTreeHost

ui/views/corewm/desktop_capture_controller_unittest.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/views/corewm/capture_controller.h"
 
 #include "base/logging.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
@@ skipping 55 matching lines @@
 // creates two widgets, does a mouse press in one, sets capture in the other and
 // verifies state is reset in the first.
 TEST_F(DesktopCaptureControllerTest, ResetMouseHandlers) {
   scoped_ptr<Widget> w1(CreateWidget());
   scoped_ptr<Widget> w2(CreateWidget());
   aura::test::EventGenerator generator1(w1->GetNativeView()->GetRootWindow());
   generator1.MoveMouseToCenterOf(w1->GetNativeView());
   generator1.PressLeftButton();
   EXPECT_FALSE(w1->HasCapture());
   aura::WindowEventDispatcher* w1_dispatcher =
-      w1->GetNativeView()->GetDispatcher();
+      w1->GetNativeView()->GetHost()->dispatcher();
   EXPECT_TRUE(w1_dispatcher->mouse_pressed_handler() != NULL);
   EXPECT_TRUE(w1_dispatcher->mouse_moved_handler() != NULL);
   w2->SetCapture(w2->GetRootView());
   EXPECT_TRUE(w2->HasCapture());
   EXPECT_TRUE(w1_dispatcher->mouse_pressed_handler() == NULL);
   EXPECT_TRUE(w1_dispatcher->mouse_moved_handler() == NULL);
   w2->ReleaseCapture();
 }
 
 // Tests aura::Window capture and whether gesture events are sent to the window
@@ skipping 11 matching lines @@
   scoped_ptr<corewm::ScopedCaptureClient> scoped_capture_client(
       new corewm::ScopedCaptureClient(params.context->GetRootWindow()));
   aura::client::CaptureClient* capture_client =
       scoped_capture_client->capture_client();
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget1->Init(params);
   internal::RootView* root1 =
       static_cast<internal::RootView*>(widget1->GetRootView());
 
-  desktop_position_client1.reset(new DesktopScreenPositionClient());
+  desktop_position_client1.reset(
+      new DesktopScreenPositionClient(root_window()));
   aura::client::SetScreenPositionClient(
       widget1->GetNativeView()->GetRootWindow(),
       desktop_position_client1.get());
 
   DesktopViewInputTest* v1 = new DesktopViewInputTest();
   v1->SetBoundsRect(gfx::Rect(0, 0, 300, 300));
   root1->AddChildView(v1);
   widget1->Show();
 
   scoped_ptr<Widget> widget2(new Widget());
 
   params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget2->Init(params);
 
   internal::RootView* root2 =
       static_cast<internal::RootView*>(widget2->GetRootView());
-  desktop_position_client2.reset(new DesktopScreenPositionClient());
+  desktop_position_client2.reset(
+      new DesktopScreenPositionClient(root_window()));
   aura::client::SetScreenPositionClient(
       widget2->GetNativeView()->GetRootWindow(),
       desktop_position_client2.get());
 
   DesktopViewInputTest* v2 = new DesktopViewInputTest();
   v2->SetBoundsRect(gfx::Rect(0, 0, 300, 300));
   root2->AddChildView(v2);
   widget2->Show();
 
   EXPECT_FALSE(widget1->GetNativeView()->HasCapture());
@@ skipping 25 matching lines @@
   root2->DispatchGestureEvent(&g1);
   EXPECT_TRUE(v2->received_gesture_event());
   EXPECT_FALSE(v1->received_gesture_event());
 
   widget1->CloseNow();
   widget2->CloseNow();
   RunPendingMessages();
 }
 
 }  // namespace views