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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/multi_display_manager_unittest.cc

Issue 10675011: Rename the remaining usage of Monitor to Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 6 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 | « ash/display/multi_display_manager.cc ('k') | ash/display/secondary_display_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/multi_display_manager_unittest.cc
diff --git a/ash/monitor/multi_monitor_manager_unittest.cc b/ash/display/multi_display_manager_unittest.cc
similarity index 62%
rename from ash/monitor/multi_monitor_manager_unittest.cc
rename to ash/display/multi_display_manager_unittest.cc
index 94a28cdf6204869a88a0f07ae32366feb194073e..b1adc531f8880449f9a5910184edbf619d945420 100644
--- a/ash/monitor/multi_monitor_manager_unittest.cc
+++ b/ash/display/multi_display_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/monitor/multi_monitor_manager.h"
+#include "ash/display/multi_display_manager.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
@@ -20,29 +20,29 @@ namespace test {
using std::vector;
using std::string;
-class MultiMonitorManagerTest : public test::AshTestBase,
+class MultiDisplayManagerTest : public test::AshTestBase,
public aura::DisplayObserver,
public aura::WindowObserver {
public:
- MultiMonitorManagerTest()
+ MultiDisplayManagerTest()
: removed_count_(0U),
root_window_destroyed_(false) {
}
- virtual ~MultiMonitorManagerTest() {}
+ virtual ~MultiDisplayManagerTest() {}
virtual void SetUp() OVERRIDE {
AshTestBase::SetUp();
- monitor_manager()->AddObserver(this);
+ display_manager()->AddObserver(this);
Shell::GetPrimaryRootWindow()->AddObserver(this);
}
virtual void TearDown() OVERRIDE {
Shell::GetPrimaryRootWindow()->RemoveObserver(this);
- monitor_manager()->RemoveObserver(this);
+ display_manager()->RemoveObserver(this);
AshTestBase::TearDown();
}
- aura::MonitorManager* monitor_manager() {
- return aura::Env::GetInstance()->monitor_manager();
+ aura::DisplayManager* display_manager() {
+ return aura::Env::GetInstance()->display_manager();
}
const vector<gfx::Display>& changed() const { return changed_; }
const vector<gfx::Display>& added() const { return added_; }
@@ -86,101 +86,101 @@ class MultiMonitorManagerTest : public test::AshTestBase,
size_t removed_count_;
bool root_window_destroyed_;
- DISALLOW_COPY_AND_ASSIGN(MultiMonitorManagerTest);
+ DISALLOW_COPY_AND_ASSIGN(MultiDisplayManagerTest);
};
-TEST_F(MultiMonitorManagerTest, NativeMonitorTest) {
- aura::MonitorManager::set_use_fullscreen_host_window(true);
+TEST_F(MultiDisplayManagerTest, NativeDisplayTest) {
+ aura::DisplayManager::set_use_fullscreen_host_window(true);
- EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
+ EXPECT_EQ(1U, display_manager()->GetNumDisplays());
// Update primary and add seconary.
- UpdateMonitor("0+0-500x500,0+501-400x400");
- EXPECT_EQ(2U, monitor_manager()->GetNumDisplays());
+ UpdateDisplay("0+0-500x500,0+501-400x400");
+ EXPECT_EQ(2U, display_manager()->GetNumDisplays());
EXPECT_EQ("1 1 0", GetCountSummary());
- EXPECT_EQ(monitor_manager()->GetDisplayAt(0).id(), changed()[0].id());
- EXPECT_EQ(monitor_manager()->GetDisplayAt(1).id(), added()[0].id());
+ EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[0].id());
+ EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), added()[0].id());
EXPECT_EQ("0,0 500x500", changed()[0].bounds().ToString());
EXPECT_EQ("0,0 400x400", added()[0].bounds().ToString());
EXPECT_EQ("0,501 400x400", added()[0].bounds_in_pixel().ToString());
reset();
// Delete secondary.
- UpdateMonitor("0+0-500x500");
+ UpdateDisplay("0+0-500x500");
EXPECT_EQ("0 0 1", GetCountSummary());
reset();
// Change primary.
- UpdateMonitor("0+0-1000x600");
+ UpdateDisplay("0+0-1000x600");
EXPECT_EQ("1 0 0", GetCountSummary());
- EXPECT_EQ(monitor_manager()->GetDisplayAt(0).id(), changed()[0].id());
+ EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[0].id());
EXPECT_EQ("0,0 1000x600", changed()[0].bounds().ToString());
reset();
// Add secondary.
- UpdateMonitor("0+0-1000x600,1001+0-600x400");
- EXPECT_EQ(2U, monitor_manager()->GetNumDisplays());
+ UpdateDisplay("0+0-1000x600,1001+0-600x400");
+ EXPECT_EQ(2U, display_manager()->GetNumDisplays());
EXPECT_EQ("0 1 0", GetCountSummary());
- EXPECT_EQ(monitor_manager()->GetDisplayAt(1).id(), added()[0].id());
+ EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), added()[0].id());
EXPECT_EQ("0,0 600x400", added()[0].bounds().ToString());
EXPECT_EQ("1001,0 600x400", added()[0].bounds_in_pixel().ToString());
reset();
// Secondary removed, primary changed.
- UpdateMonitor("0+0-800x300");
- EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
+ UpdateDisplay("0+0-800x300");
+ EXPECT_EQ(1U, display_manager()->GetNumDisplays());
EXPECT_EQ("1 0 1", GetCountSummary());
- EXPECT_EQ(monitor_manager()->GetDisplayAt(0).id(), changed()[0].id());
+ EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[0].id());
EXPECT_EQ("0,0 800x300", changed()[0].bounds().ToString());
reset();
// # of display can go to zero when screen is off.
const vector<gfx::Display> empty;
- monitor_manager()->OnNativeMonitorsChanged(empty);
- EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
+ display_manager()->OnNativeDisplaysChanged(empty);
+ EXPECT_EQ(1U, display_manager()->GetNumDisplays());
EXPECT_EQ("0 0 0", GetCountSummary());
EXPECT_FALSE(root_window_destroyed());
- // Monitor configuration stays the same
+ // Display configuration stays the same
EXPECT_EQ("0,0 800x300",
- monitor_manager()->GetDisplayAt(0).bounds().ToString());
+ display_manager()->GetDisplayAt(0).bounds().ToString());
reset();
- // Connect to monitor again
- UpdateMonitor("100+100-500x400");
- EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
+ // Connect to display again
+ UpdateDisplay("100+100-500x400");
+ EXPECT_EQ(1U, display_manager()->GetNumDisplays());
EXPECT_EQ("1 0 0", GetCountSummary());
EXPECT_FALSE(root_window_destroyed());
EXPECT_EQ("0,0 500x400", changed()[0].bounds().ToString());
EXPECT_EQ("100,100 500x400", changed()[0].bounds_in_pixel().ToString());
reset();
- // Go back to zero and wake up with multiple monitors.
- monitor_manager()->OnNativeMonitorsChanged(empty);
- EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
+ // Go back to zero and wake up with multiple displays.
+ display_manager()->OnNativeDisplaysChanged(empty);
+ EXPECT_EQ(1U, display_manager()->GetNumDisplays());
EXPECT_FALSE(root_window_destroyed());
reset();
// Add secondary.
- UpdateMonitor("0+0-1000x600,1000+0-600x400");
- EXPECT_EQ(2U, monitor_manager()->GetNumDisplays());
+ UpdateDisplay("0+0-1000x600,1000+0-600x400");
+ EXPECT_EQ(2U, display_manager()->GetNumDisplays());
EXPECT_EQ("0,0 1000x600",
- monitor_manager()->GetDisplayAt(0).bounds().ToString());
+ display_manager()->GetDisplayAt(0).bounds().ToString());
EXPECT_EQ("0,0 600x400",
- monitor_manager()->GetDisplayAt(1).bounds().ToString());
+ display_manager()->GetDisplayAt(1).bounds().ToString());
EXPECT_EQ("1000,0 600x400",
- monitor_manager()->GetDisplayAt(1).bounds_in_pixel().ToString());
+ display_manager()->GetDisplayAt(1).bounds_in_pixel().ToString());
reset();
- aura::MonitorManager::set_use_fullscreen_host_window(false);
+ aura::DisplayManager::set_use_fullscreen_host_window(false);
}
// Test in emulation mode (use_fullscreen_host_window=false)
-TEST_F(MultiMonitorManagerTest, EmulatorTest) {
- EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
+TEST_F(MultiDisplayManagerTest, EmulatorTest) {
+ EXPECT_EQ(1U, display_manager()->GetNumDisplays());
- internal::MultiMonitorManager::AddRemoveMonitor();
+ internal::MultiDisplayManager::AddRemoveDisplay();
// Update primary and add seconary.
- EXPECT_EQ(2U, monitor_manager()->GetNumDisplays());
+ EXPECT_EQ(2U, display_manager()->GetNumDisplays());
#if defined(OS_WIN)
// TODO(oshima): Windows receives resize event for some reason.
EXPECT_EQ("1 1 0", GetCountSummary());
@@ -189,22 +189,22 @@ TEST_F(MultiMonitorManagerTest, EmulatorTest) {
#endif
reset();
- internal::MultiMonitorManager::CycleMonitor();
- EXPECT_EQ(2U, monitor_manager()->GetNumDisplays());
+ internal::MultiDisplayManager::CycleDisplay();
+ EXPECT_EQ(2U, display_manager()->GetNumDisplays());
// Observer gets called twice in this mode because
- // it gets notified both from |OnNativeMonitorChagned|
+ // it gets notified both from |OnNativeDisplayChagned|
// and from |RootWindowObserver|, which is the consequence of
// |SetHostSize()|.
EXPECT_EQ("4 0 0", GetCountSummary());
reset();
- internal::MultiMonitorManager::AddRemoveMonitor();
- EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
+ internal::MultiDisplayManager::AddRemoveDisplay();
+ EXPECT_EQ(1U, display_manager()->GetNumDisplays());
EXPECT_EQ("0 0 1", GetCountSummary());
reset();
- internal::MultiMonitorManager::CycleMonitor();
- EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
+ internal::MultiDisplayManager::CycleDisplay();
+ EXPECT_EQ(1U, display_manager()->GetNumDisplays());
EXPECT_EQ("0 0 0", GetCountSummary());
reset();
}
@@ -216,19 +216,19 @@ TEST_F(MultiMonitorManagerTest, EmulatorTest) {
#define MAYBE_TestDeviceScaleOnlyChange DISABLED_TestDeviceScaleOnlyChange
#endif
-TEST_F(MultiMonitorManagerTest, MAYBE_TestDeviceScaleOnlyChange) {
- aura::MonitorManager::set_use_fullscreen_host_window(true);
- UpdateMonitor("0+0-1000x600");
+TEST_F(MultiDisplayManagerTest, MAYBE_TestDeviceScaleOnlyChange) {
+ aura::DisplayManager::set_use_fullscreen_host_window(true);
+ UpdateDisplay("0+0-1000x600");
EXPECT_EQ(1,
Shell::GetPrimaryRootWindow()->compositor()->device_scale_factor());
EXPECT_EQ("1000x600",
Shell::GetPrimaryRootWindow()->bounds().size().ToString());
- UpdateMonitor("0+0-1000x600*2");
+ UpdateDisplay("0+0-1000x600*2");
EXPECT_EQ(2,
Shell::GetPrimaryRootWindow()->compositor()->device_scale_factor());
EXPECT_EQ("500x300",
Shell::GetPrimaryRootWindow()->bounds().size().ToString());
- aura::MonitorManager::set_use_fullscreen_host_window(false);
+ aura::DisplayManager::set_use_fullscreen_host_window(false);
}
} // namespace test
« no previous file with comments | « ash/display/multi_display_manager.cc ('k') | ash/display/secondary_display_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698