Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: ash/wm/window_manager_unittest.cc

Issue 23483041: [Cleanup] Remove mac code from aura/ash/views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/toplevel_window_event_handler_unittest.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/shell_test_api.h" 8 #include "ash/test/shell_test_api.h"
9 #include "ash/test/test_activation_delegate.h" 9 #include "ash/test/test_activation_delegate.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 563
564 { 564 {
565 // Client area uses null cursor. 565 // Client area uses null cursor.
566 window_delegate.set_hittest_code(HTCLIENT); 566 window_delegate.set_hittest_code(HTCLIENT);
567 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0x0); 567 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0x0);
568 root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1); 568 root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1);
569 EXPECT_EQ(ui::kCursorNull, root_window->last_cursor().native_type()); 569 EXPECT_EQ(ui::kCursorNull, root_window->last_cursor().native_type());
570 } 570 }
571 } 571 }
572 572
573 #if defined(OS_MACOSX) || defined(OS_WIN) 573 #if defined(OS_WIN)
574 #define MAYBE_TransformActivate DISABLED_TransformActivate 574 #define MAYBE_TransformActivate DISABLED_TransformActivate
575 #else 575 #else
576 #define MAYBE_TransformActivate TransformActivate 576 #define MAYBE_TransformActivate TransformActivate
577 #endif 577 #endif
578 TEST_F(WindowManagerTest, MAYBE_TransformActivate) { 578 TEST_F(WindowManagerTest, MAYBE_TransformActivate) {
579 aura::RootWindow* root_window = Shell::GetPrimaryRootWindow(); 579 aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
580 gfx::Size size = root_window->bounds().size(); 580 gfx::Size size = root_window->bounds().size();
581 EXPECT_EQ(gfx::Rect(size).ToString(), 581 EXPECT_EQ(gfx::Rect(size).ToString(),
582 Shell::GetScreen()->GetDisplayNearestPoint( 582 Shell::GetScreen()->GetDisplayNearestPoint(
583 gfx::Point()).bounds().ToString()); 583 gfx::Point()).bounds().ToString());
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 // Mouse move should show the cursor. 828 // Mouse move should show the cursor.
829 observer_a.reset(); 829 observer_a.reset();
830 observer_b.reset(); 830 observer_b.reset();
831 generator.MoveMouseTo(50, 50); 831 generator.MoveMouseTo(50, 50);
832 EXPECT_TRUE(observer_a.did_visibility_change()); 832 EXPECT_TRUE(observer_a.did_visibility_change());
833 EXPECT_FALSE(observer_b.did_visibility_change()); 833 EXPECT_FALSE(observer_b.did_visibility_change());
834 EXPECT_TRUE(observer_a.is_cursor_visible()); 834 EXPECT_TRUE(observer_a.is_cursor_visible());
835 } 835 }
836 836
837 } // namespace ash 837 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/toplevel_window_event_handler_unittest.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698