diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:06 -0800 |
| commit | b880d713c04257ca40abfef97c300afdead423b8 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/platform/gtk/PasteboardHelper.h | |
| parent | e2e7a5c57b53f01e63a0245b4420d54b454cb373 (diff) | |
| parent | 643ca7872b450ea4efacab6188849e5aac2ba161 (diff) | |
| download | external_webkit-b880d713c04257ca40abfef97c300afdead423b8.zip external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.gz external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.bz2 | |
am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp
* commit '643ca7872b450ea4efacab6188849e5aac2ba161':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/platform/gtk/PasteboardHelper.h')
| -rw-r--r-- | WebCore/platform/gtk/PasteboardHelper.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/WebCore/platform/gtk/PasteboardHelper.h b/WebCore/platform/gtk/PasteboardHelper.h index 8e67127..e589f24 100644 --- a/WebCore/platform/gtk/PasteboardHelper.h +++ b/WebCore/platform/gtk/PasteboardHelper.h @@ -41,8 +41,7 @@ public: virtual GtkClipboard* getCurrentTarget(Frame*) const = 0; virtual GtkClipboard* getClipboard(Frame*) const = 0; virtual GtkClipboard* getPrimary(Frame*) const = 0; - virtual GtkTargetList* getCopyTargetList(Frame*) const = 0; - virtual GtkTargetList* getPasteTargetList(Frame*) const = 0; + virtual GtkTargetList* targetList() const = 0; virtual gint getWebViewTargetInfoHtml() const = 0; }; |