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

Unified Diff: ui/display/test/display_manager_test_api.cc

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: fix windows build 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
« no previous file with comments | « ui/display/test/display_manager_test_api.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/test/display_manager_test_api.cc
diff --git a/ash/test/display_manager_test_api.cc b/ui/display/test/display_manager_test_api.cc
similarity index 97%
rename from ash/test/display_manager_test_api.cc
rename to ui/display/test/display_manager_test_api.cc
index d9455bdb06d112fd9707664c17689906baa6c487..5e207a4e388601d9d45c8ac149ce78aae054feb5 100644
--- a/ash/test/display_manager_test_api.cc
+++ b/ui/display/test/display_manager_test_api.cc
@@ -2,22 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/display_manager_test_api.h"
+#include "ui/display/test/display_manager_test_api.h"
#include <cstdarg>
#include <vector>
-#include "ash/display/display_manager.h"
-#include "base/command_line.h"
#include "base/strings/string_split.h"
#include "ui/display/display.h"
#include "ui/display/manager/display_layout_builder.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/display/manager/display_manager_utilities.h"
#include "ui/display/manager/managed_display_info.h"
#include "ui/display/screen.h"
-#include "ui/events/test/event_generator.h"
-namespace ash {
+namespace display {
namespace test {
namespace {
@@ -205,4 +203,4 @@ display::DisplayIdList CreateDisplayIdListN(size_t count, ...) {
}
} // namespace test
-} // namespace ash
+} // namespace display
« no previous file with comments | « ui/display/test/display_manager_test_api.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698