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

Side by Side Diff: ash/drag_drop/drag_drop_tracker.cc

Issue 11421006: Desktop aura: Break aura::Window::SetParent in two. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: I think the content_unittests timeout on linux_aura is flake, but try to fix it anyway. Created 8 years, 1 month 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
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/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() { 17 aura::Window* CreateCaptureWindow(aura::RootWindow* context_root) {
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->SetDefaultParentByTargetRoot(context_root, gfx::Rect());
22 window->Show(); 22 window->Show();
23 return window; 23 return window;
24 } 24 }
25 25
26 } // namespace 26 } // namespace
27 27
28 namespace ash { 28 namespace ash {
29 namespace internal { 29 namespace internal {
30 30
31 DragDropTracker::DragDropTracker() 31 DragDropTracker::DragDropTracker(aura::RootWindow* context_root)
32 : capture_window_(CreateCaptureWindow()) { 32 : capture_window_(CreateCaptureWindow(context_root)) {
33 capture_window_->SetCapture(); 33 capture_window_->SetCapture();
34 } 34 }
35 35
36 DragDropTracker::~DragDropTracker() { 36 DragDropTracker::~DragDropTracker() {
37 capture_window_->ReleaseCapture(); 37 capture_window_->ReleaseCapture();
38 } 38 }
39 39
40 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) { 40 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) {
41 DCHECK(capture_window_.get()); 41 DCHECK(capture_window_.get());
42 gfx::Point location_in_screen = event.location(); 42 gfx::Point location_in_screen = event.location();
(...skipping 21 matching lines...) Expand all
64 ash::wm::GetRootWindowAt(location_in_screen), 64 ash::wm::GetRootWindowAt(location_in_screen),
65 &target_root_location); 65 &target_root_location);
66 return new ui::MouseEvent(event.type(), 66 return new ui::MouseEvent(event.type(),
67 target_location, 67 target_location,
68 target_root_location, 68 target_root_location,
69 event.flags()); 69 event.flags());
70 } 70 }
71 71
72 } // namespace internal 72 } // namespace internal
73 } // namespace ash 73 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698