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

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

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Destroy ash ViewsDelegate 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 "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
(...skipping 11 matching lines...) Expand all
22 #include "ui/base/ui_base_switches.h" 22 #include "ui/base/ui_base_switches.h"
23 #include "ui/events/event.h" 23 #include "ui/events/event.h"
24 #include "ui/events/event_utils.h" 24 #include "ui/events/event_utils.h"
25 #include "ui/events/gesture_detection/gesture_configuration.h" 25 #include "ui/events/gesture_detection/gesture_configuration.h"
26 #include "ui/events/gestures/gesture_types.h" 26 #include "ui/events/gestures/gesture_types.h"
27 #include "ui/events/test/event_generator.h" 27 #include "ui/events/test/event_generator.h"
28 #include "ui/events/test/events_test_utils.h" 28 #include "ui/events/test/events_test_utils.h"
29 #include "ui/gfx/animation/linear_animation.h" 29 #include "ui/gfx/animation/linear_animation.h"
30 #include "ui/gfx/image/image_skia_rep.h" 30 #include "ui/gfx/image/image_skia_rep.h"
31 #include "ui/views/view.h" 31 #include "ui/views/view.h"
32 #include "ui/views/views_delegate.h"
33 #include "ui/views/widget/native_widget_aura.h" 32 #include "ui/views/widget/native_widget_aura.h"
34 #include "ui/views/widget/native_widget_delegate.h" 33 #include "ui/views/widget/native_widget_delegate.h"
35 #include "ui/views/widget/widget.h" 34 #include "ui/views/widget/widget.h"
36 35
37 namespace ash { 36 namespace ash {
38 namespace test { 37 namespace test {
39 38
40 namespace { 39 namespace {
41 40
42 // A simple view that makes sure RunShellDrag is invoked on mouse drag. 41 // A simple view that makes sure RunShellDrag is invoked on mouse drag.
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 drag_drop_controller_->drag_string_); 1103 drag_drop_controller_->drag_string_);
1105 EXPECT_EQ(1, drag_view->num_drag_enters_); 1104 EXPECT_EQ(1, drag_view->num_drag_enters_);
1106 EXPECT_EQ(2, drag_view->num_drag_updates_); 1105 EXPECT_EQ(2, drag_view->num_drag_updates_);
1107 EXPECT_EQ(1, drag_view->num_drops_); 1106 EXPECT_EQ(1, drag_view->num_drops_);
1108 EXPECT_EQ(0, drag_view->num_drag_exits_); 1107 EXPECT_EQ(0, drag_view->num_drag_exits_);
1109 EXPECT_TRUE(drag_view->drag_done_received_); 1108 EXPECT_TRUE(drag_view->drag_done_received_);
1110 } 1109 }
1111 1110
1112 } // namespace test 1111 } // namespace test
1113 } // namespace ash 1112 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller.cc ('k') | ash/shell/content_client/shell_browser_main_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698