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/client/window_tree_client.h" | 10 #include "ui/aura/client/window_tree_client.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 // Creates a window for capturing drag events. | 37 // Creates a window for capturing drag events. |
38 aura::Window* CreateCaptureWindow(aura::Window* context_root, | 38 aura::Window* CreateCaptureWindow(aura::Window* context_root, |
39 aura::WindowDelegate* delegate) { | 39 aura::WindowDelegate* delegate) { |
40 static CaptureWindowActivationDelegate* activation_delegate_instance = NULL; | 40 static CaptureWindowActivationDelegate* activation_delegate_instance = NULL; |
41 if (!activation_delegate_instance) | 41 if (!activation_delegate_instance) |
42 activation_delegate_instance = new CaptureWindowActivationDelegate; | 42 activation_delegate_instance = new CaptureWindowActivationDelegate; |
43 aura::Window* window = new aura::Window(delegate); | 43 aura::Window* window = new aura::Window(delegate); |
44 // Set type of window as popup to prevent different window manager codes | 44 // Set type of window as popup to prevent different window manager codes |
45 // trying to manage this window. | 45 // trying to manage this window. |
46 window->SetType(ui::wm::WINDOW_TYPE_POPUP); | 46 window->SetType(ui::wm::WINDOW_TYPE_POPUP); |
47 window->Init(aura::WINDOW_LAYER_NOT_DRAWN); | 47 window->Init(ui::LAYER_NOT_DRAWN); |
48 aura::client::ParentWindowWithContext(window, context_root, gfx::Rect()); | 48 aura::client::ParentWindowWithContext(window, context_root, gfx::Rect()); |
49 aura::client::SetActivationDelegate(window, activation_delegate_instance); | 49 aura::client::SetActivationDelegate(window, activation_delegate_instance); |
50 window->Show(); | 50 window->Show(); |
51 DCHECK(window->bounds().size().IsEmpty()); | 51 DCHECK(window->bounds().size().IsEmpty()); |
52 return window; | 52 return window; |
53 } | 53 } |
54 | 54 |
55 } // namespace | 55 } // namespace |
56 | 56 |
57 DragDropTracker::DragDropTracker(aura::Window* context_root, | 57 DragDropTracker::DragDropTracker(aura::Window* context_root, |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 capture_window_->GetRootWindow(), | 92 capture_window_->GetRootWindow(), |
93 ash::wm::GetRootWindowAt(location_in_screen), | 93 ash::wm::GetRootWindowAt(location_in_screen), |
94 &target_root_location); | 94 &target_root_location); |
95 return new ui::MouseEvent( | 95 return new ui::MouseEvent( |
96 event.type(), target_location, target_root_location, | 96 event.type(), target_location, target_root_location, |
97 ui::EventTimeForNow(), event.flags(), | 97 ui::EventTimeForNow(), event.flags(), |
98 static_cast<const ui::MouseEvent&>(event).changed_button_flags()); | 98 static_cast<const ui::MouseEvent&>(event).changed_button_flags()); |
99 } | 99 } |
100 | 100 |
101 } // namespace ash | 101 } // namespace ash |
OLD | NEW |