chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc - Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow

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 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « 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 9d29b0e3f2ebd1f7b22f522ebfca41157cdd590f..860d0e3e4e3bf6788152dec31e903b7d78d23a01 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

@@ -62,10 +62,10 @@

#endif

#if defined(USE_ASH)

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

#include "ash/common/ash_switches.h"

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

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

+#include "ash/common/wm_window.h"

#include "ash/shell.h"

#include "ash/test/cursor_manager_test_api.h"

#include "ash/test/immersive_fullscreen_controller_test_api.h"

@@ -404,9 +404,9 @@ class DetachToBrowserTabDragControllerTest

if (input_source() == INPUT_SOURCE_MOUSE)

return;

#if defined(OS_CHROMEOS)

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

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

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

+ event_generator_.reset(

+ new ui::test::EventGenerator(new ScreenEventGeneratorDelegate(

+ ash::WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(point)))));

#endif

}