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

Side by Side Diff: ash/wm/toplevel_window_event_handler_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.cc ('k') | ash/wm/window_manager_unittest.cc » ('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/wm/toplevel_window_event_handler.h" 5 #include "ash/wm/toplevel_window_event_handler.h"
6 6
7 #include "ash/ash_constants.h" 7 #include "ash/ash_constants.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 gfx::Point end = start + gfx::Vector2d(100, 10); 609 gfx::Point end = start + gfx::Vector2d(100, 10);
610 gen.GestureScrollSequence(start, end, 610 gen.GestureScrollSequence(start, end,
611 base::TimeDelta::FromMilliseconds(10), 611 base::TimeDelta::FromMilliseconds(10),
612 10); 612 10);
613 EXPECT_EQ(bounds.ToString(), notmoved->bounds().ToString()); 613 EXPECT_EQ(bounds.ToString(), notmoved->bounds().ToString());
614 } 614 }
615 } 615 }
616 616
617 // Verifies pressing escape resets the bounds to the original bounds. 617 // Verifies pressing escape resets the bounds to the original bounds.
618 // Disabled crbug.com/166219. 618 // Disabled crbug.com/166219.
619 #if defined(OS_MACOSX) || defined(OS_WIN) 619 #if defined(OS_WIN)
620 #define MAYBE_EscapeReverts DISABLED_EscapeReverts 620 #define MAYBE_EscapeReverts DISABLED_EscapeReverts
621 #else 621 #else
622 #define MAYBE_EscapeReverts EscapeReverts 622 #define MAYBE_EscapeReverts EscapeReverts
623 #endif 623 #endif
624 TEST_F(ToplevelWindowEventHandlerTest, MAYBE_EscapeReverts) { 624 TEST_F(ToplevelWindowEventHandlerTest, MAYBE_EscapeReverts) {
625 scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOMRIGHT)); 625 scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOMRIGHT));
626 aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), 626 aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
627 target.get()); 627 target.get());
628 generator.PressLeftButton(); 628 generator.PressLeftButton();
629 generator.MoveMouseBy(10, 11); 629 generator.MoveMouseBy(10, 11);
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 807
808 // Move mouse out of the window. Shadows should disappear. 808 // Move mouse out of the window. Shadows should disappear.
809 generator.MoveMouseTo(150, 150); 809 generator.MoveMouseTo(150, 150);
810 EXPECT_FALSE(HasResizeShadow()); 810 EXPECT_FALSE(HasResizeShadow());
811 811
812 RunAllPendingInMessageLoop(); 812 RunAllPendingInMessageLoop();
813 } 813 }
814 814
815 } // namespace test 815 } // namespace test
816 } // namespace ash 816 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/toplevel_window_event_handler.cc ('k') | ash/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698