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/touch | |
| 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/touch')
| -rw-r--r-- | ash/touch/touch_observer_hud.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index fb0aec2..81b6e74 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -42,7 +42,7 @@ class TouchHudCanvas : public views::View { : owner_(owner), path_index_(0), color_index_(0) { - gfx::Display display = gfx::Screen::GetPrimaryDisplay(); + gfx::Display display = Shell::GetScreen()->GetPrimaryDisplay(); gfx::Rect bounds = display.bounds(); size_.set_width(bounds.width() / kScale); size_.set_height(bounds.height() / kScale); |