| 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 ce51c6d1335ec609e057e2bc4d329189bfdb8e82..477529501483ac36aef0a12cf297d29c60488018 100644
|
| --- a/ui/aura/root_window_host_linux.cc
|
| +++ b/ui/aura/root_window_host_linux.cc
|
| @@ -26,7 +26,6 @@
|
| #include "ui/aura/client/cursor_client.h"
|
| #include "ui/aura/client/screen_position_client.h"
|
| #include "ui/aura/client/user_action_client.h"
|
| -#include "ui/aura/env.h"
|
| #include "ui/aura/root_window.h"
|
| #include "ui/base/cursor/cursor.h"
|
| #include "ui/base/events/event.h"
|
| @@ -543,6 +542,13 @@ void RootWindowHostLinux::SetCursor(gfx::NativeCursor cursor) {
|
| }
|
|
|
| bool RootWindowHostLinux::QueryMouseLocation(gfx::Point* location_return) {
|
| + client::CursorClient* cursor_client =
|
| + client::GetCursorClient(GetRootWindow());
|
| + if (cursor_client && !cursor_client->IsCursorEnabled()) {
|
| + *location_return = gfx::Point(0, 0);
|
| + return false;
|
| + }
|
| +
|
| ::Window root_return, child_return;
|
| int root_x_return, root_y_return, win_x_return, win_y_return;
|
| unsigned int mask_return;
|
|
|