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

Unified Diff: ash/screen_ash.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 | « ash/monitor/multi_monitor_manager_unittest.cc ('k') | ash/screen_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_ash.h
diff --git a/ash/screen_ash.h b/ash/screen_ash.h
index ea2021f68519babe2aefb5820ec91804b26b41e2..1b2dbbc1e3a04aaedf346c7d4e8a992a5854bbea 100644
--- a/ash/screen_ash.h
+++ b/ash/screen_ash.h
@@ -9,7 +9,8 @@
#include "base/compiler_specific.h"
#include "ash/ash_export.h"
#include "ui/gfx/insets.h"
-#include "ui/gfx/screen.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/screen_impl.h"
namespace aura {
class RootWindow;
@@ -19,7 +20,7 @@ namespace ash {
// Aura implementation of gfx::Screen. Implemented here to avoid circular
// dependencies.
-class ASH_EXPORT ScreenAsh : public gfx::Screen {
+class ASH_EXPORT ScreenAsh : public gfx::ScreenImpl {
public:
explicit ScreenAsh(aura::RootWindow* root_window);
virtual ~ScreenAsh();
@@ -32,18 +33,15 @@ class ASH_EXPORT ScreenAsh : public gfx::Screen {
static gfx::Rect GetUnmaximizedWorkAreaBounds(aura::Window* window);
protected:
- virtual gfx::Point GetCursorScreenPointImpl() OVERRIDE;
- virtual gfx::Rect GetMonitorWorkAreaNearestWindowImpl(
- gfx::NativeView view) OVERRIDE;
- virtual gfx::Rect GetMonitorAreaNearestWindowImpl(
- gfx::NativeView view) OVERRIDE;
- virtual gfx::Rect GetMonitorWorkAreaNearestPointImpl(
- const gfx::Point& point) OVERRIDE;
- virtual gfx::Rect GetMonitorAreaNearestPointImpl(
- const gfx::Point& point) OVERRIDE;
- virtual gfx::NativeWindow GetWindowAtCursorScreenPointImpl() OVERRIDE;
- virtual gfx::Size GetPrimaryMonitorSizeImpl() OVERRIDE;
- virtual int GetNumMonitorsImpl() OVERRIDE;
+ virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
+ virtual gfx::NativeWindow GetWindowAtCursorScreenPoint() OVERRIDE;
+
+ virtual int GetNumMonitors() OVERRIDE;
+ virtual gfx::Monitor GetMonitorNearestWindow(
+ gfx::NativeView view) const OVERRIDE;
+ virtual gfx::Monitor GetMonitorNearestPoint(
+ const gfx::Point& point) const OVERRIDE;
+ virtual gfx::Monitor GetPrimaryMonitor() const OVERRIDE;
private:
aura::RootWindow* root_window_;
« no previous file with comments | « ash/monitor/multi_monitor_manager_unittest.cc ('k') | ash/screen_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698