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

Unified Diff: ash/laser/laser_pointer_view.cc

Issue 2804523002: Fix mistmached |GetDisplayNearest{Window,View}| param type (Closed)
Patch Set: window Created 3 years, 8 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
« no previous file with comments | « ash/display/screen_ash.h ('k') | ash/mus/screen_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/laser/laser_pointer_view.cc
diff --git a/ash/laser/laser_pointer_view.cc b/ash/laser/laser_pointer_view.cc
index b78e545bb83d599b89ba3778beda22d6c915d2b0..d104eaffc5102ddb9ad2520f4e5ffd88ab63d01c 100644
--- a/ash/laser/laser_pointer_view.cc
+++ b/ash/laser/laser_pointer_view.cc
@@ -34,8 +34,7 @@
#include "third_party/skia/include/core/SkTypes.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
+#include "ui/base/layout.h"
#include "ui/events/base_event_utils.h"
#include "ui/events/event.h"
#include "ui/gfx/canvas.h"
@@ -239,9 +238,7 @@ LaserPointerView::LaserPointerView(base::TimeDelta life_duration,
widget_->SetBounds(root_window->GetBoundsInScreen());
set_owned_by_client();
- scale_factor_ = display::Screen::GetScreen()
- ->GetDisplayNearestWindow(widget_->GetNativeView())
- .device_scale_factor();
+ scale_factor_ = ui::GetScaleFactorForNativeView(widget_->GetNativeView());
}
LaserPointerView::~LaserPointerView() {}
« no previous file with comments | « ash/display/screen_ash.h ('k') | ash/mus/screen_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698