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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "ash/wm/window_state.h"
12 #include "base/bind.h" 11 #include "base/bind.h"
13 #include "base/callback.h" 12 #include "base/callback.h"
14 #include "base/command_line.h" 13 #include "base/command_line.h"
15 #include "base/macros.h" 14 #include "base/macros.h"
16 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
17 #include "base/run_loop.h" 16 #include "base/run_loop.h"
18 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
19 #include "build/build_config.h" 18 #include "build/build_config.h"
20 #include "chrome/browser/chrome_notification_types.h" 19 #include "chrome/browser/chrome_notification_types.h"
21 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
(...skipping 30 matching lines...) Expand all
52 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 51 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
53 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" 52 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
54 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 53 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
55 #endif 54 #endif
56 55
57 #if defined(USE_ASH) 56 #if defined(USE_ASH)
58 #include "ash/display/display_manager.h" 57 #include "ash/display/display_manager.h"
59 #include "ash/shell.h" 58 #include "ash/shell.h"
60 #include "ash/test/cursor_manager_test_api.h" 59 #include "ash/test/cursor_manager_test_api.h"
61 #include "ash/wm/coordinate_conversion.h" 60 #include "ash/wm/coordinate_conversion.h"
61 #include "ash/wm/window_state.h"
62 #include "ash/wm/window_state_aura.h"
62 #include "ash/wm/window_util.h" 63 #include "ash/wm/window_util.h"
63 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 64 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
64 #include "ui/aura/client/screen_position_client.h" 65 #include "ui/aura/client/screen_position_client.h"
65 #include "ui/aura/test/event_generator_delegate_aura.h" 66 #include "ui/aura/test/event_generator_delegate_aura.h"
66 #include "ui/aura/window_event_dispatcher.h" 67 #include "ui/aura/window_event_dispatcher.h"
67 #include "ui/events/test/event_generator.h" 68 #include "ui/events/test/event_generator.h"
68 #endif 69 #endif
69 70
70 using content::WebContents; 71 using content::WebContents;
71 72
(...skipping 2340 matching lines...) Expand 10 before | Expand all | Expand 10 after
2412 DetachToBrowserTabDragControllerTest, 2413 DetachToBrowserTabDragControllerTest,
2413 ::testing::Values("mouse", "touch")); 2414 ::testing::Values("mouse", "touch"));
2414 INSTANTIATE_TEST_CASE_P(TabDragging, 2415 INSTANTIATE_TEST_CASE_P(TabDragging,
2415 DetachToBrowserTabDragControllerTestTouch, 2416 DetachToBrowserTabDragControllerTestTouch,
2416 ::testing::Values("touch")); 2417 ::testing::Values("touch"));
2417 #else 2418 #else
2418 INSTANTIATE_TEST_CASE_P(TabDragging, 2419 INSTANTIATE_TEST_CASE_P(TabDragging,
2419 DetachToBrowserTabDragControllerTest, 2420 DetachToBrowserTabDragControllerTest,
2420 ::testing::Values("mouse")); 2421 ::testing::Values("mouse"));
2421 #endif 2422 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698