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

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

Issue 684783004: Prefix CommandLine usage with base namespace (Part 4: ash/) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 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
« no previous file with comments | « ash/display/mirror_window_controller_unittest.cc ('k') | ash/host/ash_window_tree_host_win.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/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 850
851 EXPECT_EQ(1, drag_view->num_drag_enters_); 851 EXPECT_EQ(1, drag_view->num_drag_enters_);
852 EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(), 852 EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
853 drag_view->num_drag_updates_); 853 drag_view->num_drag_updates_);
854 EXPECT_EQ(0, drag_view->num_drops_); 854 EXPECT_EQ(0, drag_view->num_drops_);
855 EXPECT_EQ(1, drag_view->num_drag_exits_); 855 EXPECT_EQ(1, drag_view->num_drag_exits_);
856 EXPECT_TRUE(drag_view->drag_done_received_); 856 EXPECT_TRUE(drag_view->drag_done_received_);
857 } 857 }
858 858
859 TEST_F(DragDropControllerTest, TouchDragDropInMultipleWindows) { 859 TEST_F(DragDropControllerTest, TouchDragDropInMultipleWindows) {
860 CommandLine::ForCurrentProcess()->AppendSwitch( 860 base::CommandLine::ForCurrentProcess()->AppendSwitch(
861 switches::kEnableTouchDragDrop); 861 switches::kEnableTouchDragDrop);
862 scoped_ptr<views::Widget> widget1(CreateNewWidget()); 862 scoped_ptr<views::Widget> widget1(CreateNewWidget());
863 DragTestView* drag_view1 = new DragTestView; 863 DragTestView* drag_view1 = new DragTestView;
864 AddViewToWidgetAndResize(widget1.get(), drag_view1); 864 AddViewToWidgetAndResize(widget1.get(), drag_view1);
865 scoped_ptr<views::Widget> widget2(CreateNewWidget()); 865 scoped_ptr<views::Widget> widget2(CreateNewWidget());
866 DragTestView* drag_view2 = new DragTestView; 866 DragTestView* drag_view2 = new DragTestView;
867 AddViewToWidgetAndResize(widget2.get(), drag_view2); 867 AddViewToWidgetAndResize(widget2.get(), drag_view2);
868 gfx::Rect widget1_bounds = widget1->GetClientAreaBoundsInScreen(); 868 gfx::Rect widget1_bounds = widget1->GetClientAreaBoundsInScreen();
869 gfx::Rect widget2_bounds = widget2->GetClientAreaBoundsInScreen(); 869 gfx::Rect widget2_bounds = widget2->GetClientAreaBoundsInScreen();
870 widget2->SetBounds(gfx::Rect(widget1_bounds.width(), 0, 870 widget2->SetBounds(gfx::Rect(widget1_bounds.width(), 0,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 911
912 EXPECT_EQ(1, drag_view2->num_drag_enters_); 912 EXPECT_EQ(1, drag_view2->num_drag_enters_);
913 num_expected_updates = num_drags - num_expected_updates; 913 num_expected_updates = num_drags - num_expected_updates;
914 EXPECT_EQ(num_expected_updates, drag_view2->num_drag_updates_); 914 EXPECT_EQ(num_expected_updates, drag_view2->num_drag_updates_);
915 EXPECT_EQ(1, drag_view2->num_drops_); 915 EXPECT_EQ(1, drag_view2->num_drops_);
916 EXPECT_EQ(0, drag_view2->num_drag_exits_); 916 EXPECT_EQ(0, drag_view2->num_drag_exits_);
917 EXPECT_FALSE(drag_view2->drag_done_received_); 917 EXPECT_FALSE(drag_view2->drag_done_received_);
918 } 918 }
919 919
920 TEST_F(DragDropControllerTest, TouchDragDropCancelsOnLongTap) { 920 TEST_F(DragDropControllerTest, TouchDragDropCancelsOnLongTap) {
921 CommandLine::ForCurrentProcess()->AppendSwitch( 921 base::CommandLine::ForCurrentProcess()->AppendSwitch(
922 switches::kEnableTouchDragDrop); 922 switches::kEnableTouchDragDrop);
923 scoped_ptr<views::Widget> widget(CreateNewWidget()); 923 scoped_ptr<views::Widget> widget(CreateNewWidget());
924 DragTestView* drag_view = new DragTestView; 924 DragTestView* drag_view = new DragTestView;
925 AddViewToWidgetAndResize(widget.get(), drag_view); 925 AddViewToWidgetAndResize(widget.get(), drag_view);
926 ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), 926 ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
927 widget->GetNativeView()); 927 widget->GetNativeView());
928 928
929 generator.PressTouch(); 929 generator.PressTouch();
930 gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint(); 930 gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
931 DispatchGesture(ui::ET_GESTURE_LONG_PRESS, point); 931 DispatchGesture(ui::ET_GESTURE_LONG_PRESS, point);
932 DispatchGesture(ui::ET_GESTURE_LONG_TAP, point); 932 DispatchGesture(ui::ET_GESTURE_LONG_TAP, point);
933 933
934 EXPECT_TRUE(drag_drop_controller_->drag_start_received_); 934 EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
935 EXPECT_TRUE(drag_drop_controller_->drag_canceled_); 935 EXPECT_TRUE(drag_drop_controller_->drag_canceled_);
936 EXPECT_EQ(0, drag_drop_controller_->num_drag_updates_); 936 EXPECT_EQ(0, drag_drop_controller_->num_drag_updates_);
937 EXPECT_FALSE(drag_drop_controller_->drop_received_); 937 EXPECT_FALSE(drag_drop_controller_->drop_received_);
938 EXPECT_EQ(base::UTF8ToUTF16("I am being dragged"), 938 EXPECT_EQ(base::UTF8ToUTF16("I am being dragged"),
939 drag_drop_controller_->drag_string_); 939 drag_drop_controller_->drag_string_);
940 EXPECT_EQ(0, drag_view->num_drag_enters_); 940 EXPECT_EQ(0, drag_view->num_drag_enters_);
941 EXPECT_EQ(0, drag_view->num_drops_); 941 EXPECT_EQ(0, drag_view->num_drops_);
942 EXPECT_EQ(0, drag_view->num_drag_exits_); 942 EXPECT_EQ(0, drag_view->num_drag_exits_);
943 EXPECT_TRUE(drag_view->drag_done_received_); 943 EXPECT_TRUE(drag_view->drag_done_received_);
944 } 944 }
945 945
946 TEST_F(DragDropControllerTest, TouchDragDropLongTapGestureIsForwarded) { 946 TEST_F(DragDropControllerTest, TouchDragDropLongTapGestureIsForwarded) {
947 CommandLine::ForCurrentProcess()->AppendSwitch( 947 base::CommandLine::ForCurrentProcess()->AppendSwitch(
948 switches::kEnableTouchDragDrop); 948 switches::kEnableTouchDragDrop);
949 scoped_ptr<views::Widget> widget(CreateNewWidget()); 949 scoped_ptr<views::Widget> widget(CreateNewWidget());
950 DragTestView* drag_view = new DragTestView; 950 DragTestView* drag_view = new DragTestView;
951 AddViewToWidgetAndResize(widget.get(), drag_view); 951 AddViewToWidgetAndResize(widget.get(), drag_view);
952 ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), 952 ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
953 widget->GetNativeView()); 953 widget->GetNativeView());
954 954
955 generator.PressTouch(); 955 generator.PressTouch();
956 gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint(); 956 gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
957 DispatchGesture(ui::ET_GESTURE_LONG_PRESS, point); 957 DispatchGesture(ui::ET_GESTURE_LONG_PRESS, point);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString()); 1075 EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString());
1076 } 1076 }
1077 for (aura::Window::Windows::iterator iter = root_windows.begin(); 1077 for (aura::Window::Windows::iterator iter = root_windows.begin();
1078 iter != root_windows.end(); ++iter) { 1078 iter != root_windows.end(); ++iter) {
1079 aura::client::SetDragDropClient(*iter, NULL); 1079 aura::client::SetDragDropClient(*iter, NULL);
1080 } 1080 }
1081 } 1081 }
1082 1082
1083 } // namespace test 1083 } // namespace test
1084 } // namespace aura 1084 } // namespace aura
OLDNEW
« no previous file with comments | « ash/display/mirror_window_controller_unittest.cc ('k') | ash/host/ash_window_tree_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698