ash/accelerators/accelerator_controller_unittest.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: ash/accelerators/accelerator_controller_unittest.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:

Index: ash/accelerators/accelerator_controller_unittest.cc

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc

index 06a3490c31ebfe9b496095925c4be829dfc58266..acbafd96786e3941130284ec520cbd93c409e9f9 100644

--- a/ash/accelerators/accelerator_controller_unittest.cc

+++ b/ash/accelerators/accelerator_controller_unittest.cc

@@ -19,11 +19,9 @@

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

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

#include "ash/common/wm_shell.h"

-#include "ash/display/display_manager.h"

#include "ash/public/cpp/shell_window_ids.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

-#include "ash/test/display_manager_test_api.h"

#include "ash/test/test_screenshot_delegate.h"

#include "ash/test/test_session_state_animator.h"

#include "ash/wm/lock_state_controller.h"

@@ -34,7 +32,9 @@

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

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

#include "ui/aura/window.h"

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

#include "ui/display/screen.h"

+#include "ui/display/test/display_manager_test_api.h"

oshima 2016/10/24 19:29:16 nit: Looks like this is obsolete.

rjkroege 2016/10/25 23:30:26 Done.

#include "ui/events/event.h"

#include "ui/events/event_processor.h"

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