Chromium Code Reviews| 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/drag_window_resizer.h" | 5 #include "ash/wm/drag_window_resizer.h" |
| 6 | 6 |
| 7 #include "ash/display/mouse_cursor_event_filter.h" | 7 #include "ash/display/mouse_cursor_event_filter.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 | 99 |
| 100 internal::ShelfLayoutManager* shelf_layout_manager() { | 100 internal::ShelfLayoutManager* shelf_layout_manager() { |
| 101 return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager(); | 101 return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager(); |
| 102 } | 102 } |
| 103 | 103 |
| 104 static DragWindowResizer* CreateDragWindowResizer( | 104 static DragWindowResizer* CreateDragWindowResizer( |
| 105 aura::Window* window, | 105 aura::Window* window, |
| 106 const gfx::Point& point_in_parent, | 106 const gfx::Point& point_in_parent, |
| 107 int window_component) { | 107 int window_component) { |
| 108 return static_cast<DragWindowResizer*>(CreateWindowResizer( | 108 return static_cast<DragWindowResizer*>(CreateWindowResizer( |
| 109 window, point_in_parent, window_component).release()); | 109 NULL, window, point_in_parent, window_component).release()); |
|
stevenjb
2013/03/13 19:31:39
NULL /* owner */
| |
| 110 } | 110 } |
| 111 | 111 |
| 112 aura::test::TestWindowDelegate delegate_; | 112 aura::test::TestWindowDelegate delegate_; |
| 113 aura::test::TestWindowDelegate delegate2_; | 113 aura::test::TestWindowDelegate delegate2_; |
| 114 aura::test::TestWindowDelegate delegate3_; | 114 aura::test::TestWindowDelegate delegate3_; |
| 115 aura::test::TestWindowDelegate delegate4_; | 115 aura::test::TestWindowDelegate delegate4_; |
| 116 aura::test::TestWindowDelegate delegate5_; | 116 aura::test::TestWindowDelegate delegate5_; |
| 117 | 117 |
| 118 scoped_ptr<aura::Window> window_; | 118 scoped_ptr<aura::Window> window_; |
| 119 scoped_ptr<aura::Window> always_on_top_window_; | 119 scoped_ptr<aura::Window> always_on_top_window_; |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 475 ASSERT_TRUE(resizer.get()); | 475 ASSERT_TRUE(resizer.get()); |
| 476 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); | 476 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); |
| 477 EXPECT_TRUE(event_filter->WarpMouseCursorIfNecessary(root_windows[0], | 477 EXPECT_TRUE(event_filter->WarpMouseCursorIfNecessary(root_windows[0], |
| 478 gfx::Point(399, 200))); | 478 gfx::Point(399, 200))); |
| 479 resizer->CompleteDrag(0); | 479 resizer->CompleteDrag(0); |
| 480 } | 480 } |
| 481 } | 481 } |
| 482 | 482 |
| 483 } // namespace internal | 483 } // namespace internal |
| 484 } // namespace ash | 484 } // namespace ash |
| OLD | NEW |