| Index: content/browser/tab_contents/web_drag_dest_delegate.h
|
| diff --git a/content/browser/tab_contents/web_drag_dest_delegate_gtk.h b/content/browser/tab_contents/web_drag_dest_delegate.h
|
| similarity index 77%
|
| rename from content/browser/tab_contents/web_drag_dest_delegate_gtk.h
|
| rename to content/browser/tab_contents/web_drag_dest_delegate.h
|
| index f7504561e306db82aaae28b15565644197f7ce6a..3e0ba9f863a541ea9c28f4d24cea8381593d2a0e 100644
|
| --- a/content/browser/tab_contents/web_drag_dest_delegate_gtk.h
|
| +++ b/content/browser/tab_contents/web_drag_dest_delegate.h
|
| @@ -2,11 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_DELEGATE_GTK_H_
|
| -#define CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_DELEGATE_GTK_H_
|
| +#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_DELEGATE_H_
|
| +#define CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_DELEGATE_H_
|
| #pragma once
|
|
|
| +#if defined(TOOLKIT_USES_GTK)
|
| #include <gtk/gtk.h>
|
| +#endif // TOOLKIT_USES_GTK
|
|
|
| #include "base/string16.h"
|
| #include "content/common/content_export.h"
|
| @@ -17,13 +19,19 @@ class TabContents;
|
| namespace content {
|
|
|
| // An optional delegate that listens for drags of bookmark data.
|
| -class CONTENT_EXPORT WebDragDestDelegateGtk {
|
| +class CONTENT_EXPORT WebDragDestDelegate {
|
| public:
|
| // Announces that a drag has started. It's valid that a drag starts, along
|
| // with over/enter/leave/drop notifications without receiving any bookmark
|
| // data.
|
| virtual void DragInitialize(TabContents* contents) = 0;
|
|
|
| + // Notifications of drag progression.
|
| + virtual void OnDragOver() = 0;
|
| + virtual void OnDragEnter() = 0;
|
| + virtual void OnDrop() = 0;
|
| +
|
| +#if defined(TOOLKIT_USES_GTK)
|
| // Returns the bookmark atom type. GTK and Views return different values here.
|
| virtual GdkAtom GetBookmarkTargetAtom() const = 0;
|
|
|
| @@ -32,18 +40,14 @@ class CONTENT_EXPORT WebDragDestDelegateGtk {
|
| virtual void OnReceiveDataFromGtk(GtkSelectionData* data) = 0;
|
| virtual void OnReceiveProcessedData(const GURL& url,
|
| const string16& title) = 0;
|
| -
|
| - // Notifications of drag progression.
|
| - virtual void OnDragOver() = 0;
|
| - virtual void OnDragEnter() = 0;
|
| - virtual void OnDrop() = 0;
|
| +#endif // TOOLKIT_USES_GTK
|
|
|
| // This should also clear any state kept about this drag.
|
| virtual void OnDragLeave() = 0;
|
|
|
| - virtual ~WebDragDestDelegateGtk() {}
|
| + virtual ~WebDragDestDelegate() {}
|
| };
|
|
|
| } // namespace content
|
|
|
| -#endif // CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_DELEGATE_GTK_H_
|
| +#endif // CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_DELEGATE_H_
|
|
|