diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:51:17 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:51:17 +0000 |
| commit | ffabb1ea75e662308da91e916a0ffc922525aa18 (patch) | |
| tree | 788b1ac84169a936b02d10feda6c94efaee129ea /ash/screen_ash.h | |
| parent | c856e976800426511cd1a0f74d38c1fa7c883018 (diff) | |
| download | chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.zip chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.gz chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.bz2 | |
Makes gfx::Screen an instance, rather than a collection of static methods.
This is in support of supporting separate Screen implementations on Aura for desktop and metro on Windows.
Some callsites are not yet correct, and noted with a reference to the http://crbug.com/133312. As-is those sites will behave the same as before this patch, but may not be correct once desktop/metro can run simultaneously.
BUG=133312
Review URL: https://chromiumcodereview.appspot.com/11030017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/screen_ash.h')
| -rw-r--r-- | ash/screen_ash.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ash/screen_ash.h b/ash/screen_ash.h index 8d83685..078b765 100644 --- a/ash/screen_ash.h +++ b/ash/screen_ash.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "base/compiler_specific.h" -#include "ui/gfx/screen_impl.h" +#include "ui/gfx/screen.h" namespace gfx { class Rect; @@ -17,7 +17,7 @@ namespace ash { // Aura implementation of gfx::Screen. Implemented here to avoid circular // dependencies. -class ASH_EXPORT ScreenAsh : public gfx::ScreenImpl { +class ASH_EXPORT ScreenAsh : public gfx::Screen { public: ScreenAsh(); virtual ~ScreenAsh(); @@ -56,6 +56,9 @@ class ASH_EXPORT ScreenAsh : public gfx::ScreenImpl { static const gfx::Display& GetSecondaryDisplay(); protected: + + // Implementation of gfx::Screen: + virtual bool IsDIPEnabled() OVERRIDE; virtual gfx::Point GetCursorScreenPoint() OVERRIDE; virtual gfx::NativeWindow GetWindowAtCursorScreenPoint() OVERRIDE; |