diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 18:50:45 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 18:50:45 +0000 |
| commit | ebc1dea7ab6f535eac8db6de630d7c509d57b6d8 (patch) | |
| tree | 828fcb3eca002347745a2c754f194060e7af265a /ash/test/ash_test_base.cc | |
| parent | f70e426254b0dda5540398aa47202d8d8c817196 (diff) | |
| download | chromium_src-ebc1dea7ab6f535eac8db6de630d7c509d57b6d8.zip chromium_src-ebc1dea7ab6f535eac8db6de630d7c509d57b6d8.tar.gz chromium_src-ebc1dea7ab6f535eac8db6de630d7c509d57b6d8.tar.bz2 | |
Rename the remaining usage of Monitor to Display
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10675011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_base.cc')
| -rw-r--r-- | ash/test/ash_test_base.cc | 14 |
1 files changed, 7 insertions, 7 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() { |