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/tooltips | |
| 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/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index fd70c0d..3bb99bc 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -68,8 +68,8 @@ gfx::Font GetDefaultFont() { int GetMaxWidth(int x, int y) { // TODO(varunjain): implementation duplicated in tooltip_manager_aura. Figure // out a way to merge. - gfx::Rect display_bounds = - gfx::Screen::GetDisplayNearestPoint(gfx::Point(x, y)).bounds(); + gfx::Rect display_bounds = ash::Shell::GetScreen()->GetDisplayNearestPoint( + gfx::Point(x, y)).bounds(); return (display_bounds.width() + 1) / 2; } @@ -164,8 +164,8 @@ class TooltipController::Tooltip : public views::WidgetObserver { tooltip_height); tooltip_rect.Offset(kCursorOffsetX, kCursorOffsetY); - gfx::Rect display_bounds = - gfx::Screen::GetDisplayNearestPoint(tooltip_rect.origin()).bounds(); + gfx::Rect display_bounds = Shell::GetScreen()->GetDisplayNearestPoint( + tooltip_rect.origin()).bounds(); // If tooltip is out of bounds on the x axis, we simply shift it // horizontally by the offset. |