Chromium Code Reviews

Unified Diff: ui/aura/bench/bench_main.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.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/bench/bench_main.cc
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 92a837e21a38988531b9028bb49082c30ebd0f6f..be3465bacb8e3a4e45a9654bc2b190303313f488 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);
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine