Window ownership -> WindowTreeHost

ash/wm/window_manager_unittest.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 "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
@@ skipping 165 matching lines @@
 
   // Click on a sub-window (w121) to focus it.
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        w121.get());
   generator.ClickLeftButton();
 
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w121.get());
   EXPECT_EQ(w121.get(), focus_client->GetFocusedWindow());
 
-  aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
+  aura::WindowEventDispatcher* dispatcher =
+      root_window->GetHost()->dispatcher();
 
   // The key press should be sent to the focused sub-window.
   ui::KeyEvent keyev(ui::ET_KEY_PRESSED, ui::VKEY_E, 0, false);
   ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&keyev);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(ui::VKEY_E, w121delegate->last_key_code());
 
   // Touch on a sub-window (w122) to focus it.
   gfx::Point click_point = w122->bounds().CenterPoint();
   aura::Window::ConvertPointToTarget(w122->parent(), root_window, &click_point);
@@ skipping 242 matching lines @@
   EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   d1.Clear();
 
   // Touch window2.
   gfx::Point press_point = w2->bounds().CenterPoint();
   aura::Window::ConvertPointToTarget(w2->parent(), root_window, &press_point);
   ui::TouchEvent touchev1(ui::ET_TOUCH_PRESSED, press_point, 0, getTime());
 
-  aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
+  aura::WindowEventDispatcher* dispatcher =
+      root_window->GetHost()->dispatcher();
   ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&touchev1);
   ASSERT_FALSE(details.dispatcher_destroyed);
 
   // Window2 should have become active.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
   EXPECT_EQ(w2.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(0, d1.activated_count());
   EXPECT_EQ(1, d1.lost_active_count());
   EXPECT_EQ(1, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
@@ skipping 41 matching lines @@
     -1,
     gfx::Rect(kWindowLeft, kWindowTop, 640, 480)));
 
   // Create two mouse movement events we can switch between.
   gfx::Point point1(kWindowLeft, kWindowTop);
   aura::Window::ConvertPointToTarget(window->parent(), root_window, &point1);
 
   gfx::Point point2(kWindowLeft + 1, kWindowTop + 1);
   aura::Window::ConvertPointToTarget(window->parent(), root_window, &point2);
 
-  aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
+  aura::WindowEventDispatcher* dispatcher =
+      root_window->GetHost()->dispatcher();
 
   // Cursor starts as a pointer (set during Shell::Init()).
   EXPECT_EQ(ui::kCursorPointer,
             dispatcher->host()->last_cursor().native_type());
 
   {
     // Resize edges and corners show proper cursors.
     window_delegate.set_hittest_code(HTBOTTOM);
     ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0, 0);
     ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move1);
@@ skipping 84 matching lines @@
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   gfx::Size size = root_window->bounds().size();
   EXPECT_EQ(gfx::Rect(size).ToString(),
             Shell::GetScreen()->GetDisplayNearestPoint(
                 gfx::Point()).bounds().ToString());
 
   // Rotate it clock-wise 90 degrees.
   gfx::Transform transform;
   transform.Translate(size.width(), 0);
   transform.Rotate(90.0f);
-  root_window->GetDispatcher()->host()->SetTransform(transform);
+  root_window->GetHost()->SetTransform(transform);
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&wd, 1, gfx::Rect(0, 15, 50, 50)));
   d1.SetWindow(w1.get());
   w1->Show();
 
   gfx::Point miss_point(5, 5);
   transform.TransformPoint(&miss_point);
   ui::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
                           miss_point,
                           miss_point,
                           ui::EF_LEFT_MOUSE_BUTTON,
                           ui::EF_LEFT_MOUSE_BUTTON);
-  aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
+  aura::WindowEventDispatcher* dispatcher =
+      root_window->GetHost()->dispatcher();
   ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&mouseev1);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(NULL, aura::client::GetFocusClient(w1.get())->GetFocusedWindow());
   ui::MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
                          miss_point,
                          miss_point,
                          ui::EF_LEFT_MOUSE_BUTTON,
                          ui::EF_LEFT_MOUSE_BUTTON);
   details = dispatcher->OnEventFromSource(&mouseup);
   ASSERT_FALSE(details.dispatcher_destroyed);
@@ skipping 31 matching lines @@
   scoped_ptr<CustomEventHandler> f2(new CustomEventHandler);
 
   // Adds them to root window event filter.
   views::corewm::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
   env_filter->AddHandler(f1.get());
   env_filter->AddHandler(f2.get());
 
   // Dispatches mouse and keyboard events.
   ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, false);
-  aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
+  aura::WindowEventDispatcher* dispatcher =
+      root_window->GetHost()->dispatcher();
   ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event);
   ASSERT_FALSE(details.dispatcher_destroyed);
   ui::MouseEvent mouse_pressed(
       ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0), 0, 0);
   details = dispatcher->OnEventFromSource(&mouse_pressed);
   ASSERT_FALSE(details.dispatcher_destroyed);
 
   // Both filters should get the events.
   EXPECT_EQ(1, f1->num_key_events());
   EXPECT_EQ(1, f1->num_mouse_events());
@@ skipping 145 matching lines @@
   observer_a.reset();
   observer_b.reset();
   generator.MoveMouseTo(50, 50);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash