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

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

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "ui/aura/test/test_windows.h" 55 #include "ui/aura/test/test_windows.h"
56 #include "ui/aura/window_targeter.h" 56 #include "ui/aura/window_targeter.h"
57 #endif 57 #endif
58 58
59 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 59 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
60 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" 60 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
61 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 61 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
62 #endif 62 #endif
63 63
64 #if defined(USE_ASH) 64 #if defined(USE_ASH)
65 #include "ash/aura/wm_window_aura.h"
66 #include "ash/common/ash_switches.h" 65 #include "ash/common/ash_switches.h"
67 #include "ash/common/wm/root_window_finder.h" 66 #include "ash/common/wm/root_window_finder.h"
68 #include "ash/common/wm/window_state.h" 67 #include "ash/common/wm/window_state.h"
68 #include "ash/common/wm_window.h"
69 #include "ash/shell.h" 69 #include "ash/shell.h"
70 #include "ash/test/cursor_manager_test_api.h" 70 #include "ash/test/cursor_manager_test_api.h"
71 #include "ash/test/immersive_fullscreen_controller_test_api.h" 71 #include "ash/test/immersive_fullscreen_controller_test_api.h"
72 #include "ash/wm/window_state_aura.h" 72 #include "ash/wm/window_state_aura.h"
73 #include "ash/wm/window_util.h" 73 #include "ash/wm/window_util.h"
74 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 74 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
75 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" 75 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
76 #include "ui/aura/client/screen_position_client.h" 76 #include "ui/aura/client/screen_position_client.h"
77 #include "ui/aura/test/event_generator_delegate_aura.h" 77 #include "ui/aura/test/event_generator_delegate_aura.h"
78 #include "ui/aura/window_event_dispatcher.h" 78 #include "ui/aura/window_event_dispatcher.h"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 InputSource input_source() const { 397 InputSource input_source() const {
398 return strstr(GetParam(), "mouse") ? 398 return strstr(GetParam(), "mouse") ?
399 INPUT_SOURCE_MOUSE : INPUT_SOURCE_TOUCH; 399 INPUT_SOURCE_MOUSE : INPUT_SOURCE_TOUCH;
400 } 400 }
401 401
402 // Set root window from a point in screen coordinates 402 // Set root window from a point in screen coordinates
403 void SetEventGeneratorRootWindow(const gfx::Point& point) { 403 void SetEventGeneratorRootWindow(const gfx::Point& point) {
404 if (input_source() == INPUT_SOURCE_MOUSE) 404 if (input_source() == INPUT_SOURCE_MOUSE)
405 return; 405 return;
406 #if defined(OS_CHROMEOS) 406 #if defined(OS_CHROMEOS)
407 event_generator_.reset(new ui::test::EventGenerator( 407 event_generator_.reset(
408 new ScreenEventGeneratorDelegate(ash::WmWindowAura::GetAuraWindow( 408 new ui::test::EventGenerator(new ScreenEventGeneratorDelegate(
409 ash::wm::GetRootWindowAt(point))))); 409 ash::WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(point)))));
410 #endif 410 #endif
411 } 411 }
412 412
413 // The following methods update one of the mouse or touch input depending upon 413 // The following methods update one of the mouse or touch input depending upon
414 // the InputSource. 414 // the InputSource.
415 bool PressInput(const gfx::Point& location) { 415 bool PressInput(const gfx::Point& location) {
416 if (input_source() == INPUT_SOURCE_MOUSE) { 416 if (input_source() == INPUT_SOURCE_MOUSE) {
417 return ui_test_utils::SendMouseMoveSync(location) && 417 return ui_test_utils::SendMouseMoveSync(location) &&
418 ui_test_utils::SendMouseEventsSync( 418 ui_test_utils::SendMouseEventsSync(
419 ui_controls::LEFT, ui_controls::DOWN); 419 ui_controls::LEFT, ui_controls::DOWN);
(...skipping 2128 matching lines...) Expand 10 before | Expand all | Expand 10 after
2548 DetachToBrowserTabDragControllerTest, 2548 DetachToBrowserTabDragControllerTest,
2549 ::testing::Values("mouse", "touch")); 2549 ::testing::Values("mouse", "touch"));
2550 INSTANTIATE_TEST_CASE_P(TabDragging, 2550 INSTANTIATE_TEST_CASE_P(TabDragging,
2551 DetachToBrowserTabDragControllerTestTouch, 2551 DetachToBrowserTabDragControllerTestTouch,
2552 ::testing::Values("touch")); 2552 ::testing::Values("touch"));
2553 #else 2553 #else
2554 INSTANTIATE_TEST_CASE_P(TabDragging, 2554 INSTANTIATE_TEST_CASE_P(TabDragging,
2555 DetachToBrowserTabDragControllerTest, 2555 DetachToBrowserTabDragControllerTest,
2556 ::testing::Values("mouse")); 2556 ::testing::Values("mouse"));
2557 #endif 2557 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698