Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3783)

Unified Diff: ash/display/cursor_window_controller.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5
Patch Set: . Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/display/cursor_window_controller.cc
diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc
index eb334b835a69dca9344b86414158e5c908f700d2..fb0bff90bce51b71e5e6110c0c7af5393c6a0e16 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.

Powered by Google App Engine
This is Rietveld 408576698