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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « ash/drag_drop/drag_drop_controller.h ('k') | ash/drag_drop/drag_drop_controller_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/wm/coordinate_conversion.h" 10 #include "ash/wm/coordinate_conversion.h"
(...skipping 13 matching lines...) Expand all
24 #include "ui/gfx/animation/linear_animation.h" 24 #include "ui/gfx/animation/linear_animation.h"
25 #include "ui/gfx/path.h" 25 #include "ui/gfx/path.h"
26 #include "ui/gfx/point.h" 26 #include "ui/gfx/point.h"
27 #include "ui/gfx/rect.h" 27 #include "ui/gfx/rect.h"
28 #include "ui/gfx/rect_conversions.h" 28 #include "ui/gfx/rect_conversions.h"
29 #include "ui/views/views_delegate.h" 29 #include "ui/views/views_delegate.h"
30 #include "ui/views/widget/native_widget_aura.h" 30 #include "ui/views/widget/native_widget_aura.h"
31 #include "ui/wm/public/drag_drop_delegate.h" 31 #include "ui/wm/public/drag_drop_delegate.h"
32 32
33 namespace ash { 33 namespace ash {
34 namespace internal { 34 namespace {
35 35
36 namespace {
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;
40 // The frame rate of the drag cancel animation in hertz. 39 // The frame rate of the drag cancel animation in hertz.
41 const int kCancelAnimationFrameRate = 60; 40 const int kCancelAnimationFrameRate = 60;
42 41
43 // For touch initiated dragging, we scale and shift drag image by the following: 42 // For touch initiated dragging, we scale and shift drag image by the following:
44 static const float kTouchDragImageScale = 1.2f; 43 static const float kTouchDragImageScale = 1.2f;
45 static const int kTouchDragImageVerticalOffset = -25; 44 static const int kTouchDragImageVerticalOffset = -25;
46 45
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 void DragDropController::Cleanup() { 552 void DragDropController::Cleanup() {
554 if (drag_window_) 553 if (drag_window_)
555 drag_window_->RemoveObserver(this); 554 drag_window_->RemoveObserver(this);
556 drag_window_ = NULL; 555 drag_window_ = NULL;
557 drag_data_ = NULL; 556 drag_data_ = NULL;
558 // Cleanup can be called again while deleting DragDropTracker, so use Pass 557 // Cleanup can be called again while deleting DragDropTracker, so use Pass
559 // instead of reset to avoid double free. 558 // instead of reset to avoid double free.
560 drag_drop_tracker_.Pass(); 559 drag_drop_tracker_.Pass();
561 } 560 }
562 561
563 } // namespace internal
564 } // namespace ash 562 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller.h ('k') | ash/drag_drop/drag_drop_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698