ash/drag_drop/drag_drop_controller.cc - Issue 12263050: Rework ash::CursorManager into a corewm object, to share code with desktop.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12263050: Rework ash::CursorManager into a corewm object, to share code with desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT Created 7 years, 10 months 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

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_controller.h"	5 #include "ash/drag_drop/drag_drop_controller.h"

6	6

7 #include "ash/drag_drop/drag_drop_tracker.h"	7 #include "ash/drag_drop/drag_drop_tracker.h"

8 #include "ash/drag_drop/drag_image_view.h"	8 #include "ash/drag_drop/drag_image_view.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "ash/wm/coordinate_conversion.h"	10 #include "ash/wm/coordinate_conversion.h"

11 #include "ash/wm/cursor_manager.h"

12 #include "base/bind.h"	11 #include "base/bind.h"

13 #include "base/message_loop.h"	12 #include "base/message_loop.h"

14 #include "base/run_loop.h"	13 #include "base/run_loop.h"

15 #include "ui/aura/client/capture_client.h"	14 #include "ui/aura/client/capture_client.h"

16 #include "ui/aura/client/drag_drop_delegate.h"	15 #include "ui/aura/client/drag_drop_delegate.h"

17 #include "ui/aura/env.h"	16 #include "ui/aura/env.h"

18 #include "ui/aura/root_window.h"	17 #include "ui/aura/root_window.h"

19 #include "ui/aura/window.h"	18 #include "ui/aura/window.h"

20 #include "ui/base/animation/linear_animation.h"	19 #include "ui/base/animation/linear_animation.h"

21 #include "ui/base/dragdrop/drag_drop_types.h"	20 #include "ui/base/dragdrop/drag_drop_types.h"

(...skipping 473 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
495 drag_window_->RemoveObserver(this);	494 drag_window_->RemoveObserver(this);

496 drag_window_ = NULL;	495 drag_window_ = NULL;

497 drag_data_ = NULL;	496 drag_data_ = NULL;

498 // Cleanup can be called again while deleting DragDropTracker, so use Pass	497 // Cleanup can be called again while deleting DragDropTracker, so use Pass

499 // instead of reset to avoid double free.	498 // instead of reset to avoid double free.

500 drag_drop_tracker_.Pass();	499 drag_drop_tracker_.Pass();

501 }	500 }

502	501

503 } // namespace internal	502 } // namespace internal

504 } // namespace ash	503 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/display/mouse_cursor_event_filter_unittest.cc ('k') | ash/shell.h » ('j') | no next file with comments »