diff options
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/ash_test_base.cc | 14 | ||||
| -rw-r--r-- | ash/test/ash_test_base.h | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 5b92cd8..45996b2 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -12,7 +12,7 @@ #include "base/string_split.h" #include "content/public/test/web_contents_tester.h" #include "ui/aura/env.h" -#include "ui/aura/monitor_manager.h" +#include "ui/aura/display_manager.h" #include "ui/aura/root_window.h" #include "ui/base/ime/text_input_test_support.h" #include "ui/compositor/layer_animator.h" @@ -30,7 +30,7 @@ std::vector<gfx::Display> CreateDisplaysFromString( base::SplitString(specs, ',', &parts); for (std::vector<std::string>::const_iterator iter = parts.begin(); iter != parts.end(); ++iter) { - displays.push_back(aura::MonitorManager::CreateMonitorFromSpec(*iter)); + displays.push_back(aura::DisplayManager::CreateDisplayFromSpec(*iter)); } return displays; } @@ -72,20 +72,20 @@ void AshTestBase::TearDown() { ui::TextInputTestSupport::Shutdown(); } -void AshTestBase::ChangeMonitorConfig(float scale, +void AshTestBase::ChangeDisplayConfig(float scale, const gfx::Rect& bounds_in_pixel) { gfx::Display display = gfx::Display(gfx::Screen::GetPrimaryDisplay().id()); display.SetScaleAndBounds(scale, bounds_in_pixel); std::vector<gfx::Display> displays; displays.push_back(display); - aura::Env::GetInstance()->monitor_manager()->OnNativeMonitorsChanged( + aura::Env::GetInstance()->display_manager()->OnNativeDisplaysChanged( displays); } -void AshTestBase::UpdateMonitor(const std::string& display_specs) { +void AshTestBase::UpdateDisplay(const std::string& display_specs) { std::vector<gfx::Display> displays = CreateDisplaysFromString(display_specs); - aura::Env::GetInstance()->monitor_manager()-> - OnNativeMonitorsChanged(displays); + aura::Env::GetInstance()->display_manager()-> + OnNativeDisplaysChanged(displays); } void AshTestBase::RunAllPendingInMessageLoop() { diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h index 559b370..e26d2c3 100644 --- a/ash/test/ash_test_base.h +++ b/ash/test/ash_test_base.h @@ -36,16 +36,16 @@ class AshTestBase : public testing::Test { virtual void SetUp() OVERRIDE; virtual void TearDown() OVERRIDE; - // Change the primary monitor's configuration to use |bounds| + // Change the primary display's configuration to use |bounds| // and |scale|. - void ChangeMonitorConfig(float scale, const gfx::Rect& bounds); + void ChangeDisplayConfig(float scale, const gfx::Rect& bounds); // Update the display configuration as given in |display_specs|. The // format of |display_spec| is a list of comma separated spec for // each displays. Please refer to the comment in - // | aura::MonitorManager::CreateMonitorFromSpec| for the format of + // | aura::DisplayManager::CreateDisplayFromSpec| for the format of // the display spec. - void UpdateMonitor(const std::string& display_specs); + void UpdateDisplay(const std::string& display_specs); protected: void RunAllPendingInMessageLoop(); |