| 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 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" |
| 6 | 6 |
| 7 #include <X11/Xatom.h> | 7 #include <X11/Xatom.h> |
| 8 | 8 |
| 9 #include "base/event_types.h" | 9 #include "base/event_types.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 bool DesktopDragDropClientAuraX11::X11DragContext::CanDispatchEvent( | 356 bool DesktopDragDropClientAuraX11::X11DragContext::CanDispatchEvent( |
| 357 const ui::PlatformEvent& event) { | 357 const ui::PlatformEvent& event) { |
| 358 return event->xany.window == source_window_; | 358 return event->xany.window == source_window_; |
| 359 } | 359 } |
| 360 | 360 |
| 361 uint32_t DesktopDragDropClientAuraX11::X11DragContext::DispatchEvent( | 361 uint32_t DesktopDragDropClientAuraX11::X11DragContext::DispatchEvent( |
| 362 const ui::PlatformEvent& event) { | 362 const ui::PlatformEvent& event) { |
| 363 if (event->type == PropertyNotify && | 363 if (event->type == PropertyNotify && |
| 364 event->xproperty.atom == atom_cache_->GetAtom("XdndActionList")) { | 364 event->xproperty.atom == atom_cache_->GetAtom("XdndActionList")) { |
| 365 ReadActions(); | 365 ReadActions(); |
| 366 return ui::POST_DISPATCH_STOP_PROPAGATION; | 366 return ui::kPostDispatchStopPropagation; |
| 367 } | 367 } |
| 368 return ui::POST_DISPATCH_NONE; | 368 return ui::kPostDispatchNone; |
| 369 } | 369 } |
| 370 | 370 |
| 371 /////////////////////////////////////////////////////////////////////////////// | 371 /////////////////////////////////////////////////////////////////////////////// |
| 372 | 372 |
| 373 DesktopDragDropClientAuraX11::DesktopDragDropClientAuraX11( | 373 DesktopDragDropClientAuraX11::DesktopDragDropClientAuraX11( |
| 374 aura::Window* root_window, | 374 aura::Window* root_window, |
| 375 views::DesktopNativeCursorManager* cursor_manager, | 375 views::DesktopNativeCursorManager* cursor_manager, |
| 376 Display* xdisplay, | 376 Display* xdisplay, |
| 377 ::Window xwindow) | 377 ::Window xwindow) |
| 378 : root_window_(root_window), | 378 : root_window_(root_window), |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1128 for (int x = 0; x < in_bitmap->width(); ++x) { | 1128 for (int x = 0; x < in_bitmap->width(); ++x) { |
| 1129 if (SkColorGetA(in_row[x]) > kMinAlpha) | 1129 if (SkColorGetA(in_row[x]) > kMinAlpha) |
| 1130 return true; | 1130 return true; |
| 1131 } | 1131 } |
| 1132 } | 1132 } |
| 1133 | 1133 |
| 1134 return false; | 1134 return false; |
| 1135 } | 1135 } |
| 1136 | 1136 |
| 1137 } // namespace views | 1137 } // namespace views |
| OLD | NEW |