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 /ui/aura/bench | |
| 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 'ui/aura/bench')
| -rw-r--r-- | ui/aura/bench/bench_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index 92a837e..be3465b 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -14,7 +14,7 @@ #include "ui/aura/env.h" #include "ui/aura/event.h" #include "ui/aura/root_window.h" -#include "ui/aura/single_monitor_manager.h" +#include "ui/aura/single_display_manager.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" @@ -282,11 +282,11 @@ int main(int argc, char** argv) { MessageLoop message_loop(MessageLoop::TYPE_UI); ui::CompositorTestSupport::Initialize(); - aura::SingleMonitorManager* manager = new aura::SingleMonitorManager; + aura::SingleDisplayManager* manager = new aura::SingleDisplayManager; manager->set_use_fullscreen_host_window(true); - aura::Env::GetInstance()->SetMonitorManager(manager); + aura::Env::GetInstance()->SetDisplayManager(manager); scoped_ptr<aura::RootWindow> root_window( - aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); + aura::DisplayManager::CreateRootWindowForPrimaryDisplay()); // add layers ColoredLayer background(SK_ColorRED); |