diff options
| author | scottmg <scottmg@chromium.org> | 2016-01-26 21:07:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 05:08:46 +0000 |
| commit | e8b0429751298d4bff935658ad0501597bedfb54 (patch) | |
| tree | 2fc8223b144eb8183f9b248b40cb13fa07f808f6 /ash/display/cursor_window_controller.cc | |
| parent | fc512ffcf066bf2c50b565bd54019ee0074a542d (diff) | |
| download | chromium_src-e8b0429751298d4bff935658ad0501597bedfb54.zip chromium_src-e8b0429751298d4bff935658ad0501597bedfb54.tar.gz chromium_src-e8b0429751298d4bff935658ad0501597bedfb54.tar.bz2 | |
Remove now-unnecessary wrappers around gfx::Screen::GetScreen()
- ash::Shell::GetScreen()
- DisplayInfoProvider::GetActiveScreen()
Followup to https://codereview.chromium.org/1608733002/.
R=oshima@chromium.org, sky@chromium.org
BUG=558054
Review URL: https://codereview.chromium.org/1608053002
Cr-Commit-Position: refs/heads/master@{#371733}
Diffstat (limited to 'ash/display/cursor_window_controller.cc')
| -rw-r--r-- | ash/display/cursor_window_controller.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc index eb334b8..fb0bff9 100644 --- a/ash/display/cursor_window_controller.cc +++ b/ash/display/cursor_window_controller.cc @@ -23,6 +23,7 @@ #include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" +#include "ui/gfx/screen.h" namespace ash { @@ -101,7 +102,7 @@ void CursorWindowController::SetCursorCompositingEnabled(bool enabled) { void CursorWindowController::UpdateContainer() { if (is_cursor_compositing_enabled_) { - gfx::Screen* screen = Shell::GetScreen(); + gfx::Screen* screen = gfx::Screen::GetScreen(); gfx::Display display = screen->GetDisplayNearestPoint( screen->GetCursorScreenPoint()); DCHECK(display.is_valid()); @@ -113,7 +114,7 @@ void CursorWindowController::UpdateContainer() { ->mirror_window_controller() ->GetWindow(); if (mirror_window) - display_ = Shell::GetScreen()->GetPrimaryDisplay(); + display_ = gfx::Screen::GetScreen()->GetPrimaryDisplay(); SetContainer(mirror_window); } // Updates the hot point based on the current display. |