Convert Aura to use ui::Event.

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/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/cursor_manager.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/env.h"
-#include "ui/aura/event.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/shared/input_method_event_filter.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_event_filter.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/base/cursor/cursor.h"
+#include "ui/base/event.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 
 base::TimeDelta getTime() {
   return base::Time::NowFromSystemTime() - base::Time();
 }
 
 }  // namespace
@@ skipping 73 matching lines @@
 
   // Click on a sub-window (w121) to focus it.
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        w121.get());
   generator.ClickLeftButton();
 
   aura::FocusManager* focus_manager = w121->GetFocusManager();
   EXPECT_EQ(w121.get(), focus_manager->GetFocusedWindow());
 
   // The key press should be sent to the focused sub-window.
-  aura::KeyEvent keyev(ui::ET_KEY_PRESSED, ui::VKEY_E, 0);
+  ui::KeyEvent keyev(ui::ET_KEY_PRESSED, ui::VKEY_E, 0);
   root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev);
   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::ConvertPointToWindow(w122->parent(), root_window, &click_point);
-  aura::TouchEvent touchev(ui::ET_TOUCH_PRESSED, click_point, 0, getTime());
+  aura::Window::ConvertPointToTarget(w122->parent(), root_window, &click_point);
+  ui::TouchEventImpl touchev(ui::ET_TOUCH_PRESSED, click_point, 0, getTime());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev);
   focus_manager = w122->GetFocusManager();
   EXPECT_EQ(w122.get(), focus_manager->GetFocusedWindow());
 
   // The key press should be sent to the focused sub-window.
   root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev);
   EXPECT_EQ(ui::VKEY_E, w122delegate->last_key_code());
 
   // Hiding the focused window will set the focus to its parent if
   // it's focusable.
@@ skipping 119 matching lines @@
           &wd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          w11.get());
     // First set the focus to the child |w11|.
     generator.ClickLeftButton();
     EXPECT_EQ(w11.get(), focus_manager->GetFocusedWindow());
     EXPECT_EQ(w1.get(), wm::GetActiveWindow());
 
     // Then click the parent active window. The focus shouldn't move.
     gfx::Point left_top = w1->bounds().origin();
-    aura::Window::ConvertPointToWindow(w1->parent(), root_window, &left_top);
+    aura::Window::ConvertPointToTarget(w1->parent(), root_window, &left_top);
     left_top.Offset(1, 1);
     generator.MoveMouseTo(left_top);
     generator.ClickLeftButton();
     EXPECT_EQ(w11.get(), focus_manager->GetFocusedWindow());
     EXPECT_EQ(w1.get(), wm::GetActiveWindow());
   }
 
   // Clicking on a non-focusable window inside a background window should still
   // give focus to the background window.
   {
@@ skipping 38 matching lines @@
   // Activate window1.
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_manager->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::ConvertPointToWindow(w2->parent(), root_window, &press_point);
-  aura::TouchEvent touchev1(ui::ET_TOUCH_PRESSED, press_point, 0, getTime());
+  aura::Window::ConvertPointToTarget(w2->parent(), root_window, &press_point);
+  ui::TouchEventImpl touchev1(ui::ET_TOUCH_PRESSED, press_point, 0, getTime());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev1);
 
   // Window2 should have become active.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
   EXPECT_EQ(w2.get(), focus_manager->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());
   d1.Clear();
   d2.Clear();
 
   // Touch window1, but set it up so w1 doesn't activate on touch.
   press_point = w1->bounds().CenterPoint();
-  aura::Window::ConvertPointToWindow(w1->parent(), root_window, &press_point);
+  aura::Window::ConvertPointToTarget(w1->parent(), root_window, &press_point);
   d1.set_activate(false);
-  aura::TouchEvent touchev2(ui::ET_TOUCH_PRESSED, press_point, 1, getTime());
+  ui::TouchEventImpl touchev2(ui::ET_TOUCH_PRESSED, press_point, 1, getTime());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev2);
 
   // Window2 should still be active and focused.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
   EXPECT_EQ(w2.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(0, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   d1.Clear();
@@ skipping 21 matching lines @@
   const int kWindowTop = 45;
   HitTestWindowDelegate window_delegate;
   scoped_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
     &window_delegate,
     -1,
     gfx::Rect(kWindowLeft, kWindowTop, 640, 480),
     NULL));
 
   // Create two mouse movement events we can switch between.
   gfx::Point point1(kWindowLeft, kWindowTop);
-  aura::Window::ConvertPointToWindow(window->parent(), root_window, &point1);
-  aura::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0x0);
+  aura::Window::ConvertPointToTarget(window->parent(), root_window, &point1);
+  ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0x0);
 
   gfx::Point point2(kWindowLeft + 1, kWindowTop + 1);
-  aura::Window::ConvertPointToWindow(window->parent(), root_window, &point2);
-  aura::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0x0);
+  aura::Window::ConvertPointToTarget(window->parent(), root_window, &point2);
+  ui::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0x0);
 
   // Cursor starts as a pointer (set during Shell::Init()).
   EXPECT_EQ(ui::kCursorPointer, root_window->last_cursor().native_type());
 
   // Resize edges and corners show proper cursors.
   window_delegate.set_hittest_code(HTBOTTOM);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1);
   EXPECT_EQ(ui::kCursorSouthResize, root_window->last_cursor().native_type());
 
   window_delegate.set_hittest_code(HTBOTTOMLEFT);
@@ skipping 58 matching lines @@
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(
       CreateTestWindowWithDelegate(&wd, 1, gfx::Rect(0, 10, 50, 50), NULL));
   d1.SetWindow(w1.get());
   w1->Show();
 
   gfx::Point miss_point(5, 5);
   transform.TransformPoint(miss_point);
-  aura::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
-                            miss_point,
-                            miss_point,
-                            ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
+                          miss_point,
+                          miss_point,
+                          ui::EF_LEFT_MOUSE_BUTTON);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev1);
   EXPECT_FALSE(w1->GetFocusManager()->GetFocusedWindow());
-  aura::MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
-                           miss_point,
-                           miss_point,
-                           ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
+                         miss_point,
+                         miss_point,
+                         ui::EF_LEFT_MOUSE_BUTTON);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseup);
 
   gfx::Point hit_point(5, 15);
   transform.TransformPoint(hit_point);
-  aura::MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
-                            hit_point,
-                            hit_point,
-                            ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
+                          hit_point,
+                          hit_point,
+                          ui::EF_LEFT_MOUSE_BUTTON);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev2);
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), w1->GetFocusManager()->GetFocusedWindow());
 }
 
 TEST_F(WindowManagerTest, AdditionalFilters) {
   // The IME event filter interferes with the basic key event propagation we
   // attempt to do here, so we remove it.
   Shell::TestApi shell_test(Shell::GetInstance());
   Shell::GetInstance()->RemoveEnvEventFilter(
@@ skipping 10 matching lines @@
   scoped_ptr<aura::test::TestEventFilter> f1(new aura::test::TestEventFilter);
   scoped_ptr<aura::test::TestEventFilter> f2(new aura::test::TestEventFilter);
 
   // Adds them to root window event filter.
   aura::shared::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
   env_filter->AddFilter(f1.get());
   env_filter->AddFilter(f2.get());
 
   // Dispatches mouse and keyboard events.
-  aura::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
+  ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
   root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&key_event);
-  aura::MouseEvent mouse_pressed(
+  ui::MouseEvent mouse_pressed(
       ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_pressed);
 
   // Both filters should get the events.
   EXPECT_EQ(1, f1->key_event_count());
   EXPECT_EQ(1, f1->mouse_event_count());
   EXPECT_EQ(1, f2->key_event_count());
   EXPECT_EQ(1, f2->mouse_event_count());
 
   f1->ResetCounts();
   f2->ResetCounts();
 
   // Makes f1 consume events.
   f1->set_consumes_key_events(true);
   f1->set_consumes_mouse_events(true);
 
   // Dispatches events.
   root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&key_event);
-  aura::MouseEvent mouse_released(
+  ui::MouseEvent mouse_released(
       ui::ET_MOUSE_RELEASED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_released);
 
   // f1 should still get the events but f2 no longer gets them.
   EXPECT_EQ(1, f1->key_event_count());
   EXPECT_EQ(1, f1->mouse_event_count());
   EXPECT_EQ(0, f2->key_event_count());
   EXPECT_EQ(0, f2->mouse_event_count());
 
   f1->ResetCounts();
@@ skipping 21 matching lines @@
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   root_window->SetBounds(gfx::Rect(0, 0, 500, 500));
   scoped_ptr<aura::Window> window(aura::test::CreateTestWindow(
       SK_ColorWHITE, -1, gfx::Rect(0, 0, 500, 500), NULL));
 
   aura::shared::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
   ash::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();
 
-  aura::MouseEvent mouse_moved(
+  ui::MouseEvent mouse_moved(
       ui::ET_MOUSE_MOVED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
-  aura::TouchEvent touch_pressed1(
+  ui::TouchEventImpl touch_pressed1(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, getTime());
-  aura::TouchEvent touch_pressed2(
+  ui::TouchEventImpl touch_pressed2(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 1, getTime());
 
   env_filter->set_update_cursor_visibility(true);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed1);
   EXPECT_FALSE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 
   env_filter->set_update_cursor_visibility(false);
   cursor_manager->ShowCursor(false);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_FALSE(cursor_manager->cursor_visible());
   cursor_manager->ShowCursor(true);
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 }
 
 }  // namespace ash