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

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.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_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 0a8dca11691649205e875eaa804ddcc592b65cd9..671fcd17549476ce419c80c280205ed09c10ceed 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -31,7 +31,6 @@
#include "ui/views/drag_utils.h"
#include "ui/views/view_constants_aura.h"
#include "ui/views/widget/desktop_aura/desktop_capture_client.h"
-#include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"
#include "ui/views/widget/desktop_aura/desktop_event_client.h"
#include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
#include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
@@ -445,10 +444,8 @@ void DesktopNativeWidgetAura::InitNativeWidget(
// The host's dispatcher must be added to |native_cursor_manager_| before
// OnNativeWidgetCreated() is called.
cursor_reference_count_++;
- if (!native_cursor_manager_) {
- native_cursor_manager_ = new DesktopNativeCursorManager(
- DesktopCursorLoaderUpdater::Create());
- }
+ if (!native_cursor_manager_)
+ native_cursor_manager_ = new DesktopNativeCursorManager();
if (!cursor_manager_) {
cursor_manager_ = new wm::CursorManager(
std::unique_ptr<wm::NativeCursorManager>(native_cursor_manager_));

Powered by Google App Engine
This is Rietveld 408576698