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

Unified Diff: ui/aura/shared/compound_event_filter.cc

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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: ui/aura/shared/compound_event_filter.cc
diff --git a/ui/aura/shared/compound_event_filter.cc b/ui/aura/shared/compound_event_filter.cc
index b9f0716174218c55da9135bc75d63499fc4bc23a..b14712ec93ef52f6eab934489db0a79c50245e39 100644
--- a/ui/aura/shared/compound_event_filter.cc
+++ b/ui/aura/shared/compound_event_filter.cc
@@ -86,8 +86,9 @@ size_t CompoundEventFilter::GetFilterCount() const {
// CompoundEventFilter, private:
void CompoundEventFilter::UpdateCursor(Window* target, ui::MouseEvent* event) {
+ aura::RootWindow* root_window = target->GetRootWindow();
client::CursorClient* client =
- client::GetCursorClient(target->GetRootWindow());
+ client::GetCursorClient(root_window);
if (client) {
gfx::NativeCursor cursor = target->GetCursor(event->location());
if (event->flags() & ui::EF_IS_NON_CLIENT) {
@@ -97,6 +98,8 @@ void CompoundEventFilter::UpdateCursor(Window* target, ui::MouseEvent* event) {
}
client->SetCursor(cursor);
+ client->SetDeviceScaleFactor(
+ root_window->AsRootWindowHostDelegate()->GetDeviceScaleFactor());
}
}

Powered by Google App Engine
This is Rietveld 408576698