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

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

Issue 1898223002: Removes most aura dependencies from WindowResizer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_aura_from_window_state
Patch Set: nit and merge 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
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 51 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
52 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" 52 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
53 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 53 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
54 #endif 54 #endif
55 55
56 #if defined(USE_ASH) 56 #if defined(USE_ASH)
57 #include "ash/display/display_manager.h" 57 #include "ash/display/display_manager.h"
58 #include "ash/shell.h" 58 #include "ash/shell.h"
59 #include "ash/test/cursor_manager_test_api.h" 59 #include "ash/test/cursor_manager_test_api.h"
60 #include "ash/wm/coordinate_conversion.h" 60 #include "ash/wm/aura/wm_window_aura.h"
61 #include "ash/wm/common/root_window_finder.h"
61 #include "ash/wm/window_state.h" 62 #include "ash/wm/window_state.h"
62 #include "ash/wm/window_state_aura.h" 63 #include "ash/wm/window_state_aura.h"
63 #include "ash/wm/window_util.h" 64 #include "ash/wm/window_util.h"
64 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 65 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
65 #include "ui/aura/client/screen_position_client.h" 66 #include "ui/aura/client/screen_position_client.h"
66 #include "ui/aura/test/event_generator_delegate_aura.h" 67 #include "ui/aura/test/event_generator_delegate_aura.h"
67 #include "ui/aura/window_event_dispatcher.h" 68 #include "ui/aura/window_event_dispatcher.h"
68 #include "ui/events/test/event_generator.h" 69 #include "ui/events/test/event_generator.h"
69 #endif 70 #endif
70 71
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 return strstr(GetParam(), "mouse") ? 381 return strstr(GetParam(), "mouse") ?
381 INPUT_SOURCE_MOUSE : INPUT_SOURCE_TOUCH; 382 INPUT_SOURCE_MOUSE : INPUT_SOURCE_TOUCH;
382 } 383 }
383 384
384 // Set root window from a point in screen coordinates 385 // Set root window from a point in screen coordinates
385 void SetEventGeneratorRootWindow(const gfx::Point& point) { 386 void SetEventGeneratorRootWindow(const gfx::Point& point) {
386 if (input_source() == INPUT_SOURCE_MOUSE) 387 if (input_source() == INPUT_SOURCE_MOUSE)
387 return; 388 return;
388 #if defined(OS_CHROMEOS) 389 #if defined(OS_CHROMEOS)
389 event_generator_.reset(new ui::test::EventGenerator( 390 event_generator_.reset(new ui::test::EventGenerator(
390 new ScreenEventGeneratorDelegate(ash::wm::GetRootWindowAt(point)))); 391 new ScreenEventGeneratorDelegate(ash::wm::WmWindowAura::GetAuraWindow(
392 ash::wm::GetRootWindowAt(point)))));
391 #endif 393 #endif
392 } 394 }
393 395
394 // The following methods update one of the mouse or touch input depending upon 396 // The following methods update one of the mouse or touch input depending upon
395 // the InputSource. 397 // the InputSource.
396 bool PressInput(const gfx::Point& location) { 398 bool PressInput(const gfx::Point& location) {
397 if (input_source() == INPUT_SOURCE_MOUSE) { 399 if (input_source() == INPUT_SOURCE_MOUSE) {
398 return ui_test_utils::SendMouseMoveSync(location) && 400 return ui_test_utils::SendMouseMoveSync(location) &&
399 ui_test_utils::SendMouseEventsSync( 401 ui_test_utils::SendMouseEventsSync(
400 ui_controls::LEFT, ui_controls::DOWN); 402 ui_controls::LEFT, ui_controls::DOWN);
(...skipping 2012 matching lines...) Expand 10 before | Expand all | Expand 10 after
2413 DetachToBrowserTabDragControllerTest, 2415 DetachToBrowserTabDragControllerTest,
2414 ::testing::Values("mouse", "touch")); 2416 ::testing::Values("mouse", "touch"));
2415 INSTANTIATE_TEST_CASE_P(TabDragging, 2417 INSTANTIATE_TEST_CASE_P(TabDragging,
2416 DetachToBrowserTabDragControllerTestTouch, 2418 DetachToBrowserTabDragControllerTestTouch,
2417 ::testing::Values("touch")); 2419 ::testing::Values("touch"));
2418 #else 2420 #else
2419 INSTANTIATE_TEST_CASE_P(TabDragging, 2421 INSTANTIATE_TEST_CASE_P(TabDragging,
2420 DetachToBrowserTabDragControllerTest, 2422 DetachToBrowserTabDragControllerTest,
2421 ::testing::Values("mouse")); 2423 ::testing::Values("mouse"));
2422 #endif 2424 #endif
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/ui/views/tabs/window_finder_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698