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

Unified Diff: ui/aura/single_monitor_manager.h

Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 8 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
« no previous file with comments | « ui/aura/root_window_host_linux.cc ('k') | ui/aura/single_monitor_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/single_monitor_manager.h
diff --git a/ui/aura/single_monitor_manager.h b/ui/aura/single_monitor_manager.h
index 85dfffa61e66f5b887e70dc1dcf524d25b8cac16..8b1494c2b8631384c305104c904901c0e92404c3 100644
--- a/ui/aura/single_monitor_manager.h
+++ b/ui/aura/single_monitor_manager.h
@@ -11,6 +11,7 @@
#include "ui/aura/aura_export.h"
#include "ui/aura/monitor_manager.h"
#include "ui/aura/window_observer.h"
+#include "ui/gfx/monitor.h"
namespace gfx {
class Rect;
@@ -27,16 +28,17 @@ class AURA_EXPORT SingleMonitorManager : public MonitorManager,
// MonitorManager overrides:
virtual void OnNativeMonitorsChanged(
- const std::vector<const Monitor*>& monitors) OVERRIDE;
+ const std::vector<gfx::Monitor>& monitors) OVERRIDE;
virtual RootWindow* CreateRootWindowForMonitor(
- Monitor* monitor) OVERRIDE;
- virtual const Monitor* GetMonitorNearestWindow(
+ const gfx::Monitor& monitor) OVERRIDE;
+ virtual const gfx::Monitor& GetMonitorAt(size_t index) OVERRIDE;
+
+ virtual size_t GetNumMonitors() const OVERRIDE;
+
+ virtual const gfx::Monitor& GetMonitorNearestWindow(
const Window* window) const OVERRIDE;
- virtual const Monitor* GetMonitorNearestPoint(
+ virtual const gfx::Monitor& GetMonitorNearestPoint(
const gfx::Point& point) const OVERRIDE;
- virtual Monitor* GetMonitorAt(size_t index) OVERRIDE;
- virtual size_t GetNumMonitors() const OVERRIDE;
- virtual Monitor* GetMonitorNearestWindow(const Window* window) OVERRIDE;
// WindowObserver overrides:
virtual void OnWindowBoundsChanged(Window* window,
@@ -48,7 +50,7 @@ class AURA_EXPORT SingleMonitorManager : public MonitorManager,
void Update(const gfx::Size size);
RootWindow* root_window_;
- scoped_ptr<Monitor> monitor_;
+ gfx::Monitor monitor_;
DISALLOW_COPY_AND_ASSIGN(SingleMonitorManager);
};
« no previous file with comments | « ui/aura/root_window_host_linux.cc ('k') | ui/aura/single_monitor_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698