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

Unified Diff: ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc

Issue 2504743002: Linux Aura: Fixes and improvements for cursor loader (Closed)
Patch Set: Formatting Created 4 years, 1 month 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/views/widget/desktop_aura/desktop_native_cursor_manager.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc
index ea8df16d00d917eb3f1220108fb7ad74a2d8c4d0..51ebef29467fbc94bbf28054cd81db09adf0fdfd 100644
--- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc
@@ -9,17 +9,11 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/cursor/cursor_loader.h"
-#include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"
namespace views {
-DesktopNativeCursorManager::DesktopNativeCursorManager(
- std::unique_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater)
- : cursor_loader_updater_(std::move(cursor_loader_updater)),
- cursor_loader_(ui::CursorLoader::Create()) {
- if (cursor_loader_updater_.get())
- cursor_loader_updater_->OnCreate(1.0f, cursor_loader_.get());
-}
+DesktopNativeCursorManager::DesktopNativeCursorManager()
+ : cursor_loader_(ui::CursorLoader::Create()) {}
DesktopNativeCursorManager::~DesktopNativeCursorManager() {
}
@@ -45,9 +39,6 @@ void DesktopNativeCursorManager::SetDisplay(
cursor_loader_->set_rotation(display.rotation());
cursor_loader_->set_scale(display.device_scale_factor());
- if (cursor_loader_updater_.get())
- cursor_loader_updater_->OnDisplayUpdated(display, cursor_loader_.get());
-
SetCursor(delegate->GetCursor(), delegate);
}

Powered by Google App Engine
This is Rietveld 408576698