chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc - Issue 2035543004: Shuffles and renames ash/common/wm classes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 2035543004: Shuffles and renames ash/common/wm classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: random changes for chrome tests Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

« ash/common/wm_window.h ('K') | « chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc ('k') | chrome/browser/ui/views/tabs/window_finder_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

index ade79c8e8b1f204b7f3e9fd4f514997909971fa1..808fe1c9ccf48e27bafc70d0552d3bd2c130538e 100644

--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

@@ -58,12 +58,12 @@

#endif

#if defined(USE_ASH)

+#include "ash/aura/wm_window_aura.h"

#include "ash/common/wm/root_window_finder.h"

#include "ash/common/wm/window_state.h"

#include "ash/display/display_manager.h"

#include "ash/shell.h"

#include "ash/test/cursor_manager_test_api.h"

-#include "ash/wm/aura/wm_window_aura.h"

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

#include "chrome/browser/ui/views/frame/immersive_mode_controller.h"

@@ -392,7 +392,7 @@ class DetachToBrowserTabDragControllerTest

return;

#if defined(OS_CHROMEOS)

event_generator_.reset(new ui::test::EventGenerator(

- new ScreenEventGeneratorDelegate(ash::wm::WmWindowAura::GetAuraWindow(

+ new ScreenEventGeneratorDelegate(ash::WmWindowAura::GetAuraWindow(

ash::wm::GetRootWindowAt(point)))));

#endif

}