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

Unified Diff: ui/aura/root_window_host_linux.cc

Issue 11035050: Enable CursorManager::LockCursor to lock cursor visibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win_aura build Created 8 years, 2 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 | « ui/aura/root_window_host_linux.h ('k') | ui/aura/root_window_host_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_host_linux.cc
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc
index e21c8703551f09c572ba6b1c9afc971080e86829..83dcee065582b036f4bbcd9b9d96efff64ccb6b0 100644
--- a/ui/aura/root_window_host_linux.cc
+++ b/ui/aura/root_window_host_linux.cc
@@ -282,8 +282,6 @@ RootWindowHostLinux::RootWindowHostLinux(const gfx::Rect& bounds)
x_root_window_(DefaultRootWindow(xdisplay_)),
current_cursor_(ui::kCursorNull),
window_mapped_(false),
- cursor_shown_(true),
- invisible_cursor_(ui::CreateInvisibleCursor(), xdisplay_),
bounds_(bounds),
focus_when_shown_(false),
pointer_barriers_(NULL),
@@ -741,16 +739,7 @@ void RootWindowHostLinux::SetCursor(gfx::NativeCursor cursor) {
if (cursor == current_cursor_)
return;
current_cursor_ = cursor;
-
- if (cursor_shown_)
- SetCursorInternal(cursor);
-}
-
-void RootWindowHostLinux::ShowCursor(bool show) {
- if (show == cursor_shown_)
- return;
- cursor_shown_ = show;
- SetCursorInternal(show ? current_cursor_ : invisible_cursor_.get());
+ SetCursorInternal(cursor);
}
bool RootWindowHostLinux::QueryMouseLocation(gfx::Point* location_return) {
« no previous file with comments | « ui/aura/root_window_host_linux.h ('k') | ui/aura/root_window_host_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698