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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/ash_test_helper.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build Created 4 years, 4 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/host/ash_window_tree_host_unified.h ('K') | « ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc ('k') | ash/test/display_manager_test_api.cc » ('j') | ui/display/manager/managed_display_info.h » ('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 eb7647238f1f804c1c16241eec780cf13867eb92..8d1b5b76cd084d1fc3dfb26011fd188b91fc50d7 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -6,7 +6,6 @@
#include "ash/accelerators/accelerator_controller_delegate_aura.h"
#include "ash/common/ash_switches.h"
-#include "ash/common/display/display_info.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/test/material_design_controller_test_api.h"
#include "ash/common/wm_shell.h"
@@ -31,6 +30,7 @@
#include "ui/base/test/material_design_controller_test_api.h"
#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/message_center/message_center.h"
#include "ui/wm/core/capture_controller.h"
#include "ui/wm/core/cursor_manager.h"
@@ -73,7 +73,7 @@ AshTestHelper::~AshTestHelper() {}
void AshTestHelper::SetUp(bool start_session,
MaterialDesignController::Mode material_mode) {
- ResetDisplayIdForTest();
+ ui::ResetDisplayIdForTest();
views_delegate_.reset(new AshTestViewsDelegate);
// Disable animations during tests.
« ash/host/ash_window_tree_host_unified.h ('K') | « ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc ('k') | ash/test/display_manager_test_api.cc » ('j') | ui/display/manager/managed_display_info.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698