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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/ash_test_helper.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
« ash/system/chromeos/screen_layout_observer_unittest.cc ('K') | « ash/test/ash_test_base.cc ('k') | ash/test/ash_test_impl_aura.cc » ('j') | ash/utility/screenshot_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 2c64b655a2a9f86c321a015bcf5520436f29a6d8..21ae63c0984f50c1174485afba60eca1a40e8bfc 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -14,7 +14,6 @@
#include "ash/shell_init_params.h"
#include "ash/test/ash_test_environment.h"
#include "ash/test/ash_test_views_delegate.h"
-#include "ash/test/display_manager_test_api.h"
#include "ash/test/shell_test_api.h"
#include "ash/test/test_screenshot_delegate.h"
#include "ash/test/test_shell_delegate.h"
@@ -29,6 +28,7 @@
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/compositor/test/context_factories_for_test.h"
#include "ui/display/manager/managed_display_info.h"
+#include "ui/display/test/display_manager_test_api.h"
#include "ui/message_center/message_center.h"
#include "ui/wm/core/capture_controller.h"
#include "ui/wm/core/cursor_manager.h"
@@ -144,7 +144,7 @@ void AshTestHelper::SetUp(bool start_session,
shell->screen_layout_observer()->set_show_notifications_for_testing(false);
#endif
- test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
+ display::test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
.DisableChangeDisplayUponHostResize();
ShellTestApi(shell).DisableDisplayAnimator();
« ash/system/chromeos/screen_layout_observer_unittest.cc ('K') | « ash/test/ash_test_base.cc ('k') | ash/test/ash_test_impl_aura.cc » ('j') | ash/utility/screenshot_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698