| 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/wm/workspace/workspace_event_handler.h" | 5 #include "ash/wm/workspace/workspace_event_handler.h" |
| 6 | 6 |
| 7 #include "ash/screen_ash.h" | 7 #include "ash/screen_ash.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
| 10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 // Multi display test does not run on Win8 bot. crbug.com/247427. | 151 // Multi display test does not run on Win8 bot. crbug.com/247427. |
| 152 if (base::win::GetVersion() >= base::win::VERSION_WIN8) | 152 if (base::win::GetVersion() >= base::win::VERSION_WIN8) |
| 153 return; | 153 return; |
| 154 #endif | 154 #endif |
| 155 | 155 |
| 156 // Verify the double clicking the resize edge works on 2nd display too. | 156 // Verify the double clicking the resize edge works on 2nd display too. |
| 157 UpdateDisplay("200x200,400x300"); | 157 UpdateDisplay("200x200,400x300"); |
| 158 gfx::Rect work_area2 = ScreenAsh::GetSecondaryDisplay().work_area(); | 158 gfx::Rect work_area2 = ScreenAsh::GetSecondaryDisplay().work_area(); |
| 159 restored_bounds.SetRect(220,20, 50, 50); | 159 restored_bounds.SetRect(220,20, 50, 50); |
| 160 window->SetBoundsInScreen(restored_bounds, ScreenAsh::GetSecondaryDisplay()); | 160 window->SetBoundsInScreen(restored_bounds, ScreenAsh::GetSecondaryDisplay()); |
| 161 aura::RootWindow* second_root = Shell::GetAllRootWindows()[1]; | 161 aura::Window* second_root = Shell::GetAllRootWindows()[1]; |
| 162 EXPECT_EQ(second_root, window->GetRootWindow()); | 162 EXPECT_EQ(second_root, window->GetRootWindow()); |
| 163 aura::test::EventGenerator generator2(second_root, window.get()); | 163 aura::test::EventGenerator generator2(second_root, window.get()); |
| 164 | 164 |
| 165 // Y-axis maximization. | 165 // Y-axis maximization. |
| 166 wd.set_window_component(HTTOP); | 166 wd.set_window_component(HTTOP); |
| 167 generator2.PressLeftButton(); | 167 generator2.PressLeftButton(); |
| 168 generator2.ReleaseLeftButton(); | 168 generator2.ReleaseLeftButton(); |
| 169 generator2.set_flags(ui::EF_IS_DOUBLE_CLICK); | 169 generator2.set_flags(ui::EF_IS_DOUBLE_CLICK); |
| 170 generator2.PressLeftButton(); | 170 generator2.PressLeftButton(); |
| 171 generator2.MoveMouseTo(generator.current_location(), 1); | 171 generator2.MoveMouseTo(generator.current_location(), 1); |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 ASSERT_TRUE(aura::client::GetWindowMoveClient(window->parent())); | 339 ASSERT_TRUE(aura::client::GetWindowMoveClient(window->parent())); |
| 340 base::MessageLoop::current()->DeleteSoon(FROM_HERE, window.get()); | 340 base::MessageLoop::current()->DeleteSoon(FROM_HERE, window.get()); |
| 341 aura::client::GetWindowMoveClient(window->parent()) | 341 aura::client::GetWindowMoveClient(window->parent()) |
| 342 ->RunMoveLoop(window.release(), | 342 ->RunMoveLoop(window.release(), |
| 343 gfx::Vector2d(), | 343 gfx::Vector2d(), |
| 344 aura::client::WINDOW_MOVE_SOURCE_MOUSE); | 344 aura::client::WINDOW_MOVE_SOURCE_MOUSE); |
| 345 } | 345 } |
| 346 | 346 |
| 347 } // namespace internal | 347 } // namespace internal |
| 348 } // namespace ash | 348 } // namespace ash |
| OLD | NEW |