Fix WindowTest.Transform, and also make it run on Windows. Some of it (the bits that rely on window activation) needed to move to DEF's test in the shell.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8538017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109686 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 40 insertions, 29 deletions

diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index e41a391..913637b 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -690,11 +690,9 @@ TEST_F(WindowTest, Deactivate) {
   EXPECT_EQ(w2.get(), parent->children()[1]);
 }
 
-#if !defined(OS_WIN)
 // Tests transformation on the desktop.
 TEST_F(WindowTest, Transform) {
   Desktop* desktop = Desktop::GetInstance();
-  desktop->ShowDesktop();
   gfx::Size size = desktop->GetHostSize();
   EXPECT_EQ(gfx::Rect(size),
             gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()));
@@ -712,34 +710,7 @@ TEST_F(WindowTest, Transform) {
             desktop->bounds().ToString());
   EXPECT_EQ(gfx::Rect(transformed_size).ToString(),
             gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()).ToString());
-
-  ActivateWindowDelegate d1;
-  scoped_ptr<Window> w1(
-      CreateTestWindowWithDelegate(&d1, 1, gfx::Rect(0, 10, 50, 50), NULL));
-  w1->Show();
-
-  gfx::Point miss_point(5, 5);
-  transform.TransformPoint(miss_point);
-  MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
-                      miss_point,
-                      ui::EF_LEFT_BUTTON_DOWN);
-  desktop->DispatchMouseEvent(&mouseev1);
-  EXPECT_FALSE(w1->GetFocusManager()->GetFocusedWindow());
-  MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
-                     miss_point,
-                     ui::EF_LEFT_BUTTON_DOWN);
-  desktop->DispatchMouseEvent(&mouseup);
-
-  gfx::Point hit_point(5, 15);
-  transform.TransformPoint(hit_point);
-  MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
-                      hit_point,
-                      ui::EF_LEFT_BUTTON_DOWN);
-  desktop->DispatchMouseEvent(&mouseev2);
-  EXPECT_EQ(w1.get(), desktop->active_window());
-  EXPECT_EQ(w1.get(), w1->GetFocusManager()->GetFocusedWindow());
 }
-#endif
 
 // Various assertions for transient children.
 TEST_F(WindowTest, TransientChildren) {
diff --git a/ui/aura_shell/desktop_event_filter_unittest.cc b/ui/aura_shell/desktop_event_filter_unittest.cc
index 05118da..498dbda 100644
--- a/ui/aura_shell/desktop_event_filter_unittest.cc
+++ b/ui/aura_shell/desktop_event_filter_unittest.cc
@@ -14,6 +14,7 @@
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "ui/base/hit_test.h"
+#include "ui/gfx/screen.h"
 
 namespace aura_shell {
 namespace test {
@@ -315,5 +316,44 @@ TEST_F(DefaultEventFilterTest, MouseEventCursors) {
   EXPECT_EQ(aura::kCursorNull, desktop->last_cursor());
 }
 
+TEST_F(DefaultEventFilterTest, TransformActivate) {
+  aura::Desktop* desktop = aura::Desktop::GetInstance();
+  gfx::Size size = desktop->GetHostSize();
+  EXPECT_EQ(gfx::Rect(size),
+            gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()));
+
+  // Rotate it clock-wise 90 degrees.
+  ui::Transform transform;
+  transform.SetRotate(90.0f);
+  transform.ConcatTranslate(size.width(), 0);
+  desktop->SetTransform(transform);
+
+  aura::test::ActivateWindowDelegate d1;
+  scoped_ptr<aura::Window> w1(
+      CreateTestWindowWithDelegate(&d1, 1, gfx::Rect(0, 10, 50, 50), NULL));
+  w1->Show();
+
+  gfx::Point miss_point(5, 5);
+  transform.TransformPoint(miss_point);
+  aura::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
+                            miss_point,
+                            ui::EF_LEFT_BUTTON_DOWN);
+  desktop->DispatchMouseEvent(&mouseev1);
+  EXPECT_FALSE(w1->GetFocusManager()->GetFocusedWindow());
+  aura::MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
+                           miss_point,
+                           ui::EF_LEFT_BUTTON_DOWN);
+  desktop->DispatchMouseEvent(&mouseup);
+
+  gfx::Point hit_point(5, 15);
+  transform.TransformPoint(hit_point);
+  aura::MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
+                            hit_point,
+                            ui::EF_LEFT_BUTTON_DOWN);
+  desktop->DispatchMouseEvent(&mouseev2);
+  EXPECT_EQ(w1.get(), desktop->active_window());
+  EXPECT_EQ(w1.get(), w1->GetFocusManager()->GetFocusedWindow());
+}
+
 }  // namespace test
 }  // namespace aura_shell