OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/shell.h" | 5 #include "ash/shell.h" |
6 #include "ash/shell_window_ids.h" | 6 #include "ash/shell_window_ids.h" |
7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
8 #include "ash/test/test_activation_delegate.h" | 8 #include "ash/test/test_activation_delegate.h" |
9 #include "ash/wm/activation_controller.h" | 9 #include "ash/wm/activation_controller.h" |
10 #include "ash/wm/cursor_manager.h" | 10 #include "ash/wm/cursor_manager.h" |
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 { | 450 { |
451 // Client area uses null cursor. | 451 // Client area uses null cursor. |
452 window_delegate.set_hittest_code(HTCLIENT); | 452 window_delegate.set_hittest_code(HTCLIENT); |
453 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0x0); | 453 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0x0); |
454 root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1); | 454 root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1); |
455 EXPECT_EQ(ui::kCursorNull, root_window->last_cursor().native_type()); | 455 EXPECT_EQ(ui::kCursorNull, root_window->last_cursor().native_type()); |
456 } | 456 } |
457 } | 457 } |
458 | 458 |
459 #if defined(OS_MACOSX) | 459 #if defined(OS_MACOSX) |
460 #define MAYBE_TransformActivate FAILS_TransformActivate | 460 #define MAYBE_TransformActivate DISABLED_TransformActivate |
461 #else | 461 #else |
462 #define MAYBE_TransformActivate TransformActivate | 462 #define MAYBE_TransformActivate TransformActivate |
463 #endif | 463 #endif |
464 TEST_F(WindowManagerTest, MAYBE_TransformActivate) { | 464 TEST_F(WindowManagerTest, MAYBE_TransformActivate) { |
465 aura::RootWindow* root_window = Shell::GetPrimaryRootWindow(); | 465 aura::RootWindow* root_window = Shell::GetPrimaryRootWindow(); |
466 gfx::Size size = root_window->bounds().size(); | 466 gfx::Size size = root_window->bounds().size(); |
467 EXPECT_EQ(gfx::Rect(size).ToString(), | 467 EXPECT_EQ(gfx::Rect(size).ToString(), |
468 Shell::GetScreen()->GetDisplayNearestPoint( | 468 Shell::GetScreen()->GetDisplayNearestPoint( |
469 gfx::Point()).bounds().ToString()); | 469 gfx::Point()).bounds().ToString()); |
470 | 470 |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
630 EXPECT_TRUE(cursor_manager->cursor_visible()); | 630 EXPECT_TRUE(cursor_manager->cursor_visible()); |
631 root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2); | 631 root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2); |
632 EXPECT_FALSE(cursor_manager->cursor_visible()); | 632 EXPECT_FALSE(cursor_manager->cursor_visible()); |
633 root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved); | 633 root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved); |
634 EXPECT_TRUE(cursor_manager->cursor_visible()); | 634 EXPECT_TRUE(cursor_manager->cursor_visible()); |
635 root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_released2); | 635 root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_released2); |
636 EXPECT_TRUE(cursor_manager->cursor_visible()); | 636 EXPECT_TRUE(cursor_manager->cursor_visible()); |
637 } | 637 } |
638 | 638 |
639 } // namespace ash | 639 } // namespace ash |
OLD | NEW |