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

Unified Diff: chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.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
Index: chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
index 45dd9ca73c51efd2eb6ad70ce1f99331ac9036bc..924ed4a0a6e8c02137e87d7cda11f0e0476e244c 100644
--- a/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
@@ -5,9 +5,7 @@
#include <string>
#include "ash/common/wm/window_positioner.h"
-#include "ash/display/display_manager.h"
#include "ash/shell.h"
-#include "ash/test/display_manager_test_api.h"
#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
@@ -23,6 +21,8 @@
#include "components/user_manager/user_manager.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h"
+#include "ui/display/manager/display_manager.h"
+#include "ui/display/test/display_manager_test_api.h"
namespace policy {
@@ -41,7 +41,7 @@ class ForceMaximizeOnFirstRunTest : public LoginPolicyTestBase {
ash::WindowPositioner::GetForceMaximizedWidthLimit() + 100;
// Set resolution to 1466x300.
const std::string resolution = base::IntToString(width) + "x300";
- ash::test::DisplayManagerTestApi(
+ display::test::DisplayManagerTestApi(
ash::Shell::GetInstance()->display_manager())
.UpdateDisplay(resolution);
}
« no previous file with comments | « chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698