Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Unified Diff: ash/monitor/monitor_controller.h

Issue 10540091: Rename gfx::Monitor to gfx::Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/monitor/monitor_controller.h
diff --git a/ash/monitor/monitor_controller.h b/ash/monitor/monitor_controller.h
index abe6a13f238992da35c112a24eb0ee69dd4108da..0af1b601dd2812d29bd9a2951db97f6d042df7d9 100644
--- a/ash/monitor/monitor_controller.h
+++ b/ash/monitor/monitor_controller.h
@@ -11,11 +11,11 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "ui/aura/display_observer.h"
#include "ui/aura/monitor_manager.h"
-#include "ui/aura/monitor_observer.h"
namespace aura {
-class Monitor;
+class Display;
class RootWindow;
}
@@ -24,7 +24,7 @@ namespace internal {
// MonitorController creates and maintains RootWindows for each
// attached monitor, keeping them in sync with monitor configuration changes.
-class MonitorController : public aura::MonitorObserver {
+class MonitorController : public aura::DisplayObserver {
public:
MonitorController();
virtual ~MonitorController();
@@ -32,11 +32,11 @@ class MonitorController : public aura::MonitorObserver {
// Gets all of the root windows.
void GetAllRootWindows(std::vector<aura::RootWindow*>* windows);
- // aura::MonitorObserver overrides:
- virtual void OnMonitorBoundsChanged(
- const gfx::Monitor& monitor) OVERRIDE;
- virtual void OnMonitorAdded(const gfx::Monitor& monitor) OVERRIDE;
- virtual void OnMonitorRemoved(const gfx::Monitor& monitor) OVERRIDE;
+ // aura::DisplayObserver overrides:
+ virtual void OnDisplayBoundsChanged(
+ const gfx::Display& display) OVERRIDE;
+ virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
+ virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
private:
void Init();
« no previous file with comments | « ash/dip_unittest.cc ('k') | ash/monitor/monitor_controller.cc » ('j') | ui/gfx/screen.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698