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/wm/workspace/frame_maximize_button.cc | |
| 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/wm/workspace/frame_maximize_button.cc')
| -rw-r--r-- | ash/wm/workspace/frame_maximize_button.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc index 697cc73..76415d0 100644 --- a/ash/wm/workspace/frame_maximize_button.cc +++ b/ash/wm/workspace/frame_maximize_button.cc @@ -236,7 +236,7 @@ void FrameMaximizeButton::OnMouseExited(const ui::MouseEvent& event) { // within the bubble. if (!is_snap_enabled_ && maximizer_.get()) { if (maximizer_->GetBubbleWindow()) { - gfx::Point screen_location = gfx::Screen::GetCursorScreenPoint(); + gfx::Point screen_location = Shell::GetScreen()->GetCursorScreenPoint(); if (!maximizer_->GetBubbleWindow()->GetBoundsInScreen().Contains( screen_location)) { maximizer_.reset(); @@ -561,7 +561,7 @@ MaximizeBubbleFrameState return FRAME_STATE_FULL; // For Left/right maximize we need to check the dimensions. gfx::Rect bounds = frame_->GetWidget()->GetWindowBoundsInScreen(); - gfx::Rect screen = gfx::Screen::GetDisplayMatching(bounds).work_area(); + gfx::Rect screen = Shell::GetScreen()->GetDisplayMatching(bounds).work_area(); if (bounds.width() < (screen.width() * kMinSnapSizePercent) / 100) return FRAME_STATE_NONE; // We might still have a horizontally filled window at this point which we |