ash/monitor/multi_monitor_manager.h - Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/monitor/multi_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: fix command line 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 | « ash/monitor/monitor_controller.cc ('k') | ash/monitor/multi_monitor_manager.cc » ('j') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/monitor/multi_monitor_manager.h

diff --git a/ash/monitor/multi_monitor_manager.h b/ash/monitor/multi_monitor_manager.h

index 2bbfcbb4b73cbdf8fd6c0acaf177cfac6694646d..c2813c3f60b9d048ad343c82eed3cf6f53acc3cb 100644

--- a/ash/monitor/multi_monitor_manager.h

+++ b/ash/monitor/multi_monitor_manager.h

@@ -35,16 +35,17 @@ class ASH_EXPORT MultiMonitorManager : public aura::MonitorManager,

// MonitorManager overrides:

virtual void OnNativeMonitorsChanged(

- const std::vector<const aura::Monitor*>& monitors) OVERRIDE;

+ const std::vector<const aura::MonitorAura*>& monitors) OVERRIDE;

virtual aura::RootWindow* CreateRootWindowForMonitor(

- aura::Monitor* monitor) OVERRIDE;

- virtual const aura::Monitor* GetMonitorNearestWindow(

+ aura::MonitorAura* monitor) OVERRIDE;

+ virtual aura::MonitorAura* GetMonitorAt(size_t index) OVERRIDE;

+ virtual size_t GetNumMonitors() const OVERRIDE;

+ virtual const aura::MonitorAura* GetMonitorNearestWindow(

const aura::Window* window) const OVERRIDE;

- virtual const aura::Monitor* GetMonitorNearestPoint(

+ virtual const aura::MonitorAura* GetMonitorNearestPoint(

const gfx::Point& point) const OVERRIDE;

- virtual aura::Monitor* GetMonitorAt(size_t index) OVERRIDE;

- virtual size_t GetNumMonitors() const OVERRIDE;

- virtual aura::Monitor* GetMonitorNearestWindow(

+ virtual aura::MonitorAura* GetMonitorNearestWindow(

const aura::Window* window) OVERRIDE;

// RootWindowObserver overrides:

@@ -52,7 +53,7 @@ class ASH_EXPORT MultiMonitorManager : public aura::MonitorManager,

const gfx::Size& new_size) OVERRIDE;

private:

- typedef std::vector<aura::Monitor*> Monitors;

+ typedef std::vector<aura::MonitorAura*> Monitors;

void Init();

void AddRemoveMonitorImpl();

@@ -63,7 +64,7 @@ class ASH_EXPORT MultiMonitorManager : public aura::MonitorManager,

DISALLOW_COPY_AND_ASSIGN(MultiMonitorManager);

};

-extern const aura::WindowProperty<aura::Monitor*>* const kMonitorKey;

+extern const aura::WindowProperty<aura::MonitorAura*>* const kMonitorKey;

} // namespace internal

} // namespace ash

« no previous file with comments | « ash/monitor/monitor_controller.cc ('k') | ash/monitor/multi_monitor_manager.cc » ('j') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('J')