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

Unified Diff: ui/views/widget/desktop_aura/desktop_root_window_host_x11.h

Issue 16271006: Drag on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Document Created 7 years, 6 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
Index: ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
index 8cd7aa3ba6e0a36bae220313702f7239fb143915..ca178bad4c02c496ed450f44906d1235a6e57faf 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.h
@@ -15,7 +15,6 @@
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/root_window_host.h"
#include "ui/base/cursor/cursor_loader_x11.h"
-#include "ui/base/dragdrop/desktop_selection_provider_aurax11.h"
#include "ui/base/x/x11_atom_cache.h"
#include "ui/gfx/rect.h"
#include "ui/views/views_export.h"
@@ -43,7 +42,6 @@ class CursorManager;
class VIEWS_EXPORT DesktopRootWindowHostX11 :
public DesktopRootWindowHost,
public aura::RootWindowHost,
- public ui::DesktopSelectionProviderAuraX11,
public base::MessageLoop::Dispatcher {
public:
DesktopRootWindowHostX11(
@@ -172,10 +170,6 @@ class VIEWS_EXPORT DesktopRootWindowHostX11 :
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
virtual void PrepareForShutdown() OVERRIDE;
- // Overridden from DesktopSelectionProviderAuraX11:
- virtual void SetDropHandler(
- ui::OSExchangeDataProviderAuraX11* handler) OVERRIDE;
-
// Overridden from Dispatcher:
virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
@@ -230,9 +224,6 @@ class VIEWS_EXPORT DesktopRootWindowHostX11 :
aura::RootWindowHostDelegate* root_window_host_delegate_;
aura::Window* content_window_;
- // We forward drop related messages to this object.
- ui::OSExchangeDataProviderAuraX11* drop_handler_;
-
// The current root window host that has capture. While X11 has something
// like Windows SetCapture()/ReleaseCapture(), it is entirely implicit and
// there are no notifications when this changes. We need to track this so we

Powered by Google App Engine
This is Rietveld 408576698