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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/display/display_preferences_unittest.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 | « chrome/browser/chromeos/display/display_preferences.cc ('k') | chrome/browser/chromeos/display/overscan_calibrator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/display/display_preferences_unittest.cc
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index 47bff749fe041ff74d0e91bcdd64e38f7ea64066..553c0b6b07f26d2fde39d3ec33c2acaef7ce822a 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -12,16 +12,13 @@
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
#include "ash/display/display_util.h"
#include "ash/display/json_converter.h"
#include "ash/display/resolution_notification_controller.h"
#include "ash/display/screen_orientation_controller_chromeos.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/shell.h"
-#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
@@ -37,8 +34,10 @@
#include "ui/display/chromeos/display_configurator.h"
#include "ui/display/manager/display_layout_builder.h"
#include "ui/display/manager/display_layout_store.h"
+#include "ui/display/manager/display_manager.h"
#include "ui/display/manager/display_manager_utilities.h"
#include "ui/display/screen.h"
+#include "ui/display/test/display_manager_test_api.h"
#include "ui/gfx/geometry/vector3d_f.h"
#include "ui/message_center/message_center.h"
@@ -223,7 +222,7 @@ TEST_F(DisplayPreferencesTest, ListedLayoutOverrides) {
display::DisplayIdList list = display_manager()->GetCurrentDisplayIdList();
display::DisplayIdList dummy_list =
- ash::test::CreateDisplayIdList2(list[0], list[1] + 1);
+ display::test::CreateDisplayIdList2(list[0], list[1] + 1);
ASSERT_NE(list[0], dummy_list[1]);
StoreDisplayLayoutPrefForList(list, display::DisplayPlacement::TOP, 20);
@@ -261,7 +260,8 @@ TEST_F(DisplayPreferencesTest, BasicStores) {
UpdateDisplay("200x200*2, 400x300#400x400|300x200*1.25");
int64_t id1 = display::Screen::GetScreen()->GetPrimaryDisplay().id();
- ash::test::ScopedSetInternalDisplayId set_internal(display_manager(), id1);
+ display::test::ScopedSetInternalDisplayId set_internal(display_manager(),
+ id1);
int64_t id2 = display_manager()->GetSecondaryDisplay().id();
int64_t dummy_id = id2 + 1;
ASSERT_NE(id1, dummy_id);
@@ -271,15 +271,16 @@ TEST_F(DisplayPreferencesTest, BasicStores) {
profiles.push_back(ui::COLOR_PROFILE_MOVIE);
profiles.push_back(ui::COLOR_PROFILE_READING);
// Allows only |id1|.
- ash::test::DisplayManagerTestApi(display_manager())
+ display::test::DisplayManagerTestApi(display_manager())
.SetAvailableColorProfiles(id1, profiles);
display_manager()->SetColorCalibrationProfile(id1, ui::COLOR_PROFILE_DYNAMIC);
display_manager()->SetColorCalibrationProfile(id2, ui::COLOR_PROFILE_DYNAMIC);
LoggedInAsUser();
- display_manager()->SetLayoutForCurrentDisplays(ash::test::CreateDisplayLayout(
- display_manager(), display::DisplayPlacement::TOP, 10));
+ display_manager()->SetLayoutForCurrentDisplays(
+ display::test::CreateDisplayLayout(display_manager(),
+ display::DisplayPlacement::TOP, 10));
const display::DisplayLayout& layout =
display_manager()->GetCurrentDisplayLayout();
EXPECT_EQ(display::DisplayPlacement::TOP, layout.placement_list[0].position);
@@ -290,7 +291,8 @@ TEST_F(DisplayPreferencesTest, BasicStores) {
dummy_id, display::DisplayPlacement::LEFT, 20);
std::unique_ptr<display::DisplayLayout> dummy_layout(
dummy_layout_builder.Build());
- display::DisplayIdList list = ash::test::CreateDisplayIdList2(id1, dummy_id);
+ display::DisplayIdList list =
+ display::test::CreateDisplayIdList2(id1, dummy_id);
StoreDisplayLayoutPrefForTest(list, *dummy_layout);
// Can't switch to a display that does not exist.
@@ -300,9 +302,9 @@ TEST_F(DisplayPreferencesTest, BasicStores) {
window_tree_host_manager->SetOverscanInsets(id1, gfx::Insets(10, 11, 12, 13));
display_manager()->SetDisplayRotation(id1, display::Display::ROTATE_90,
display::Display::ROTATION_SOURCE_USER);
- EXPECT_TRUE(ash::test::DisplayManagerTestApi(display_manager())
+ EXPECT_TRUE(display::test::DisplayManagerTestApi(display_manager())
.SetDisplayUIScale(id1, 1.25f));
- EXPECT_FALSE(ash::test::DisplayManagerTestApi(display_manager())
+ EXPECT_FALSE(display::test::DisplayManagerTestApi(display_manager())
.SetDisplayUIScale(id2, 1.25f));
const base::DictionaryValue* displays =
@@ -430,9 +432,10 @@ TEST_F(DisplayPreferencesTest, BasicStores) {
EXPECT_TRUE(layout_value->GetString(kPrimaryIdKey, &primary_id_str));
EXPECT_EQ(base::Int64ToString(id2), primary_id_str);
- display_manager()->SetLayoutForCurrentDisplays(ash::test::CreateDisplayLayout(
- ash::Shell::GetInstance()->display_manager(),
- display::DisplayPlacement::BOTTOM, 20));
+ display_manager()->SetLayoutForCurrentDisplays(
+ display::test::CreateDisplayLayout(
+ ash::Shell::GetInstance()->display_manager(),
+ display::DisplayPlacement::BOTTOM, 20));
UpdateDisplay("1+0-200x200*2,1+0-200x200");
// Mirrored.
@@ -604,8 +607,8 @@ TEST_F(DisplayPreferencesTest, StoreForSwappedDisplay) {
// Updating layout with primary swapped should save the correct value.
{
display_manager()->SetLayoutForCurrentDisplays(
- ash::test::CreateDisplayLayout(display_manager(),
- display::DisplayPlacement::TOP, 10));
+ display::test::CreateDisplayLayout(display_manager(),
+ display::DisplayPlacement::TOP, 10));
const base::DictionaryValue* new_value = nullptr;
EXPECT_TRUE(displays->GetDictionary(key, &new_value));
display::DisplayLayout stored_layout;
@@ -659,7 +662,8 @@ TEST_F(DisplayPreferencesTest, RestoreColorProfiles) {
profiles.push_back(ui::COLOR_PROFILE_DYNAMIC);
profiles.push_back(ui::COLOR_PROFILE_MOVIE);
profiles.push_back(ui::COLOR_PROFILE_READING);
- ash::test::DisplayManagerTestApi(ash::Shell::GetInstance()->display_manager())
+ display::test::DisplayManagerTestApi(
+ ash::Shell::GetInstance()->display_manager())
.SetAvailableColorProfiles(id1, profiles);
LoadDisplayPreferences(false);
@@ -675,12 +679,13 @@ TEST_F(DisplayPreferencesTest, DontStoreInGuestMode) {
LoggedInAsGuest();
int64_t id1 = display::Screen::GetScreen()->GetPrimaryDisplay().id();
- ash::test::ScopedSetInternalDisplayId set_internal(
+ display::test::ScopedSetInternalDisplayId set_internal(
ash::Shell::GetInstance()->display_manager(), id1);
int64_t id2 = display_manager()->GetSecondaryDisplay().id();
- display_manager()->SetLayoutForCurrentDisplays(ash::test::CreateDisplayLayout(
- display_manager(), display::DisplayPlacement::TOP, 10));
- ash::test::DisplayManagerTestApi(display_manager())
+ display_manager()->SetLayoutForCurrentDisplays(
+ display::test::CreateDisplayLayout(display_manager(),
+ display::DisplayPlacement::TOP, 10));
+ display::test::DisplayManagerTestApi(display_manager())
.SetDisplayUIScale(id1, 1.25f);
window_tree_host_manager->SetPrimaryDisplayId(id2);
int64_t new_primary = display::Screen::GetScreen()->GetPrimaryDisplay().id();
@@ -995,8 +1000,8 @@ TEST_F(DisplayPreferencesTest, SaveUnifiedMode) {
EXPECT_FALSE(
displays->GetDictionary(base::Int64ToString(unified_id), &new_value));
- ash::test::SetDisplayResolution(display_manager(), unified_id,
- gfx::Size(200, 100));
+ display::test::SetDisplayResolution(display_manager(), unified_id,
+ gfx::Size(200, 100));
EXPECT_EQ(
"200x100",
display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString());
@@ -1020,7 +1025,7 @@ TEST_F(DisplayPreferencesTest, SaveUnifiedMode) {
// Exit unified mode.
display_manager()->SetDefaultMultiDisplayModeForCurrentDisplays(
- ash::DisplayManager::EXTENDED);
+ display::DisplayManager::EXTENDED);
ASSERT_TRUE(secondary_displays->GetDictionary(
display::DisplayIdListToString(list), &new_value));
EXPECT_TRUE(ash::JsonToDisplayLayout(*new_value, &stored_layout));
@@ -1030,7 +1035,8 @@ TEST_F(DisplayPreferencesTest, SaveUnifiedMode) {
TEST_F(DisplayPreferencesTest, RestoreUnifiedMode) {
int64_t id1 = display::Screen::GetScreen()->GetPrimaryDisplay().id();
- display::DisplayIdList list = ash::test::CreateDisplayIdList2(id1, id1 + 1);
+ display::DisplayIdList list =
+ display::test::CreateDisplayIdList2(id1, id1 + 1);
StoreDisplayBoolPropertyForList(list, "default_unified", true);
StoreDisplayPropertyForList(
list, "primary-id",
@@ -1092,7 +1098,7 @@ TEST_F(DisplayPreferencesTest, RestoreThreeDisplays) {
LoggedInAsUser();
int64_t id1 = display::Screen::GetScreen()->GetPrimaryDisplay().id();
display::DisplayIdList list =
- ash::test::CreateDisplayIdListN(3, id1, id1 + 1, id1 + 2);
+ display::test::CreateDisplayIdListN(3, id1, id1 + 1, id1 + 2);
display::DisplayLayoutBuilder builder(list[0]);
builder.AddDisplayPlacement(list[1], list[0], display::DisplayPlacement::LEFT,
« no previous file with comments | « chrome/browser/chromeos/display/display_preferences.cc ('k') | chrome/browser/chromeos/display/overscan_calibrator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698