| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ |
| 7 | 7 |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 | 9 |
| 10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. | 10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. |
| 11 #undef RootWindow | 11 #undef RootWindow |
| 12 | 12 |
| 13 #include <set> | 13 #include <set> |
| 14 | 14 |
| 15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/memory/ref_counted.h" | 16 #include "base/memory/ref_counted.h" |
| 17 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.h" |
| 18 #include "ui/aura/client/drag_drop_client.h" | 18 #include "ui/aura/client/drag_drop_client.h" |
| 19 #include "ui/aura/window_observer.h" | 19 #include "ui/aura/window_observer.h" |
| 20 #include "ui/base/cursor/cursor.h" |
| 20 #include "ui/base/x/x11_atom_cache.h" | 21 #include "ui/base/x/x11_atom_cache.h" |
| 21 #include "ui/gfx/point.h" | 22 #include "ui/gfx/point.h" |
| 22 #include "ui/views/views_export.h" | 23 #include "ui/views/views_export.h" |
| 23 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" | 24 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" |
| 24 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop_delegate.h" | 25 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop_delegate.h" |
| 25 | 26 |
| 26 namespace aura { | 27 namespace aura { |
| 27 class RootWindow; | 28 class RootWindow; |
| 28 namespace client { | 29 namespace client { |
| 29 class DragDropDelegate; | 30 class DragDropDelegate; |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 gfx::NativeCursor move_grab_cursor_; | 222 gfx::NativeCursor move_grab_cursor_; |
| 222 | 223 |
| 223 static std::map< ::Window, DesktopDragDropClientAuraX11*> g_live_client_map; | 224 static std::map< ::Window, DesktopDragDropClientAuraX11*> g_live_client_map; |
| 224 | 225 |
| 225 DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11); | 226 DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11); |
| 226 }; | 227 }; |
| 227 | 228 |
| 228 } // namespace views | 229 } // namespace views |
| 229 | 230 |
| 230 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ | 231 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ |
| OLD | NEW |