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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.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: General patch cleanup. 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
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 "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
6 6
7 #include "ash/wm/property_util.h" 7 #include "ash/wm/property_util.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 21 matching lines...) Expand all
32 #include "content/public/browser/web_contents.h" 32 #include "content/public/browser/web_contents.h"
33 #include "ui/gfx/screen.h" 33 #include "ui/gfx/screen.h"
34 #include "ui/views/view.h" 34 #include "ui/views/view.h"
35 #include "ui/views/widget/widget.h" 35 #include "ui/views/widget/widget.h"
36 36
37 #if defined(USE_ASH) 37 #if defined(USE_ASH)
38 #include "ash/display/display_controller.h" 38 #include "ash/display/display_controller.h"
39 #include "ash/display/display_manager.h" 39 #include "ash/display/display_manager.h"
40 #include "ash/shell.h" 40 #include "ash/shell.h"
41 #include "ash/test/cursor_manager_test_api.h" 41 #include "ash/test/cursor_manager_test_api.h"
42 #include "ash/wm/cursor_manager.h"
43 #include "ash/wm/window_util.h" 42 #include "ash/wm/window_util.h"
44 #include "ui/aura/root_window.h" 43 #include "ui/aura/root_window.h"
45 #include "ui/aura/test/event_generator.h" 44 #include "ui/aura/test/event_generator.h"
46 #endif 45 #endif
47 46
48 using content::WebContents; 47 using content::WebContents;
49 48
50 namespace test { 49 namespace test {
51 50
52 namespace { 51 namespace {
(...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after
1404 DifferentDeviceScaleFactorDisplayTabDragControllerTest, 1403 DifferentDeviceScaleFactorDisplayTabDragControllerTest,
1405 ::testing::Values("mouse")); 1404 ::testing::Values("mouse"));
1406 INSTANTIATE_TEST_CASE_P(TabDragging, 1405 INSTANTIATE_TEST_CASE_P(TabDragging,
1407 DetachToBrowserTabDragControllerTest, 1406 DetachToBrowserTabDragControllerTest,
1408 ::testing::Values("mouse", "touch")); 1407 ::testing::Values("mouse", "touch"));
1409 #else 1408 #else
1410 INSTANTIATE_TEST_CASE_P(TabDragging, 1409 INSTANTIATE_TEST_CASE_P(TabDragging,
1411 DetachToBrowserTabDragControllerTest, 1410 DetachToBrowserTabDragControllerTest,
1412 ::testing::Values("mouse")); 1411 ::testing::Values("mouse"));
1413 #endif 1412 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698