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

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

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments Created 5 years, 6 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
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_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 "base/bind.h" 10 #include "base/bind.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/metrics/histogram_macros.h" 12 #include "base/metrics/histogram_macros.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "ui/aura/client/capture_client.h" 14 #include "ui/aura/client/capture_client.h"
15 #include "ui/aura/env.h" 15 #include "ui/aura/env.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura/window_delegate.h" 17 #include "ui/aura/window_delegate.h"
18 #include "ui/aura/window_event_dispatcher.h" 18 #include "ui/aura/window_event_dispatcher.h"
19 #include "ui/base/dragdrop/drag_drop_types.h" 19 #include "ui/base/dragdrop/drag_drop_types.h"
20 #include "ui/base/dragdrop/os_exchange_data.h" 20 #include "ui/base/dragdrop/os_exchange_data.h"
21 #include "ui/base/hit_test.h" 21 #include "ui/base/hit_test.h"
22 #include "ui/events/event.h" 22 #include "ui/events/event.h"
23 #include "ui/events/event_utils.h" 23 #include "ui/events/event_utils.h"
24 #include "ui/gfx/animation/linear_animation.h" 24 #include "ui/gfx/animation/linear_animation.h"
25 #include "ui/gfx/geometry/point.h" 25 #include "ui/gfx/geometry/point.h"
26 #include "ui/gfx/geometry/rect.h" 26 #include "ui/gfx/geometry/rect.h"
27 #include "ui/gfx/geometry/rect_conversions.h" 27 #include "ui/gfx/geometry/rect_conversions.h"
28 #include "ui/gfx/path.h" 28 #include "ui/gfx/path.h"
29 #include "ui/views/views_delegate.h"
30 #include "ui/views/widget/native_widget_aura.h" 29 #include "ui/views/widget/native_widget_aura.h"
31 #include "ui/wm/core/coordinate_conversion.h" 30 #include "ui/wm/core/coordinate_conversion.h"
32 #include "ui/wm/public/drag_drop_delegate.h" 31 #include "ui/wm/public/drag_drop_delegate.h"
33 32
34 namespace ash { 33 namespace ash {
35 namespace { 34 namespace {
36 35
37 // The duration of the drag cancel animation in millisecond. 36 // The duration of the drag cancel animation in millisecond.
38 const int kCancelAnimationDuration = 250; 37 const int kCancelAnimationDuration = 250;
39 const int kTouchCancelAnimationDuration = 20; 38 const int kTouchCancelAnimationDuration = 20;
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 if (drag_window_) 560 if (drag_window_)
562 drag_window_->RemoveObserver(this); 561 drag_window_->RemoveObserver(this);
563 drag_window_ = NULL; 562 drag_window_ = NULL;
564 drag_data_ = NULL; 563 drag_data_ = NULL;
565 // Cleanup can be called again while deleting DragDropTracker, so delete 564 // Cleanup can be called again while deleting DragDropTracker, so delete
566 // the pointer with a local variable to avoid double free. 565 // the pointer with a local variable to avoid double free.
567 scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass(); 566 scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass();
568 } 567 }
569 568
570 } // namespace ash 569 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698