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/drag_drop/drag_drop_tracker.h" | 5 #include "ash/drag_drop/drag_drop_tracker.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "ash/wm/coordinate_conversion.h" | 9 #include "ash/wm/coordinate_conversion.h" |
10 #include "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
11 #include "ui/base/events/event.h" | 11 #include "ui/base/events/event.h" |
12 #include "ui/gfx/screen.h" | 12 #include "ui/gfx/screen.h" |
13 | 13 |
14 namespace { | 14 namespace { |
15 | 15 |
16 // Creates a window for capturing drag events. | 16 // Creates a window for capturing drag events. |
17 aura::Window* CreateCaptureWindow(aura::RootWindow* root_window) { | 17 aura::Window* CreateCaptureWindow(aura::RootWindow* root_window) { |
18 aura::Window* window = new aura::Window(NULL); | 18 aura::Window* window = new aura::Window(NULL); |
19 window->SetType(aura::client::WINDOW_TYPE_NORMAL); | 19 window->SetType(aura::client::WINDOW_TYPE_NORMAL); |
20 window->Init(ui::LAYER_NOT_DRAWN); | 20 window->Init(ui::LAYER_NOT_DRAWN); |
21 window->SetParent(NULL); | 21 window->SetParent(NULL); |
22 window->SetBoundsInScreen(root_window->GetBoundsInScreen(), | 22 window->SetBoundsInScreen(gfx::Rect(root_window->GetBoundsInScreen().origin(), |
| 23 gfx::Size()), |
23 gfx::Screen::GetDisplayNearestWindow(root_window)); | 24 gfx::Screen::GetDisplayNearestWindow(root_window)); |
24 window->Show(); | 25 window->Show(); |
25 return window; | 26 return window; |
26 } | 27 } |
27 | 28 |
28 } // namespace | 29 } // namespace |
29 | 30 |
30 namespace ash { | 31 namespace ash { |
31 namespace internal { | 32 namespace internal { |
32 | 33 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 ash::wm::GetRootWindowAt(location_in_screen), | 67 ash::wm::GetRootWindowAt(location_in_screen), |
67 &target_root_location); | 68 &target_root_location); |
68 return new ui::MouseEvent(event.type(), | 69 return new ui::MouseEvent(event.type(), |
69 target_location, | 70 target_location, |
70 target_root_location, | 71 target_root_location, |
71 event.flags()); | 72 event.flags()); |
72 } | 73 } |
73 | 74 |
74 } // namespace internal | 75 } // namespace internal |
75 } // namespace ash | 76 } // namespace ash |
OLD | NEW |