chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc - Issue 2445583002: Relocate display_manager from ash to ui

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 2445583002: Relocate display_manager from ash to ui (Closed)

Patch Set: Created 4 years, 2 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

« chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc ('K') | « chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc » ('j') | ui/display/manager/display_manager.h » ('J')
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 67c802a43c31d21ccfda9a5323137bce07d87716..10d80815a0cfdcafb4aebf88a3522c4285ead267 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

@@ -63,7 +63,6 @@

#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/test/immersive_fullscreen_controller_test_api.h"

@@ -74,6 +73,7 @@

#include "ui/aura/client/screen_position_client.h"

#include "ui/aura/test/event_generator_delegate_aura.h"

#include "ui/aura/window_event_dispatcher.h"

+#include "ui/display/manager/display_manager.h"

#include "ui/events/test/event_generator.h"

#endif

@@ -2247,7 +2247,7 @@ void CancelDragTabToWindowInSeparateDisplayStep3(

ASSERT_EQ(2u, browser_list->size());

// Switching display mode should cancel the drag operation.

- ash::DisplayManager* display_manager =

+ display::DisplayManager* display_manager =

ash::Shell::GetInstance()->display_manager();

display_manager->AddRemoveDisplay();

}