Index: ui/aura/single_display_manager.h |
diff --git a/ui/aura/single_monitor_manager.h b/ui/aura/single_display_manager.h |
similarity index 71% |
rename from ui/aura/single_monitor_manager.h |
rename to ui/aura/single_display_manager.h |
index 46ef34c4ebbce27f9342ac4b41a7a415a0b15848..d7b82653cf5e25d6b027ff01674f6c3504000d98 100644 |
--- a/ui/aura/single_monitor_manager.h |
+++ b/ui/aura/single_display_manager.h |
@@ -2,13 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef UI_AURA_SINGLE_MONITOR_MANAGER_H_ |
-#define UI_AURA_SINGLE_MONITOR_MANAGER_H_ |
+#ifndef UI_AURA_SINGLE_DISPLAY_MANAGER_H_ |
+#define UI_AURA_SINGLE_DISPLAY_MANAGER_H_ |
#pragma once |
#include "base/compiler_specific.h" |
#include "ui/aura/aura_export.h" |
-#include "ui/aura/monitor_manager.h" |
+#include "ui/aura/display_manager.h" |
#include "ui/aura/window_observer.h" |
#include "ui/gfx/display.h" |
@@ -18,17 +18,17 @@ class Rect; |
namespace aura { |
-// A monitor manager assuming there is one monitor. |
-class AURA_EXPORT SingleMonitorManager : public MonitorManager, |
+// A display manager assuming there is one display. |
+class AURA_EXPORT SingleDisplayManager : public DisplayManager, |
public WindowObserver { |
public: |
- SingleMonitorManager(); |
- virtual ~SingleMonitorManager(); |
+ SingleDisplayManager(); |
+ virtual ~SingleDisplayManager(); |
- // MonitorManager overrides: |
- virtual void OnNativeMonitorsChanged( |
+ // DisplayManager overrides: |
+ virtual void OnNativeDisplaysChanged( |
const std::vector<gfx::Display>& display) OVERRIDE; |
- virtual RootWindow* CreateRootWindowForMonitor( |
+ virtual RootWindow* CreateRootWindowForDisplay( |
const gfx::Display& display) OVERRIDE; |
virtual const gfx::Display& GetDisplayAt(size_t index) OVERRIDE; |
@@ -52,9 +52,9 @@ class AURA_EXPORT SingleMonitorManager : public MonitorManager, |
RootWindow* root_window_; |
gfx::Display display_; |
- DISALLOW_COPY_AND_ASSIGN(SingleMonitorManager); |
+ DISALLOW_COPY_AND_ASSIGN(SingleDisplayManager); |
}; |
} // namespace aura |
-#endif // UI_AURA_SINGLE_MONITOR_MANAGER_H_ |
+#endif // UI_AURA_SINGLE_DISPLAY_MANAGER_H_ |