diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-18 14:49:48 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:12:37 +0200 |
| commit | 21f5af631e538d69c3d9b659b6681179dcde970f (patch) | |
| tree | a463130dacfeb0c13aaebb0fbdc9f1d8a02ed6b9 | |
| parent | 53feebcccb2bb2758c5790a938bb03e2948af63c (diff) | |
| download | qtwebengine-chromium-21f5af631e538d69c3d9b659b6681179dcde970f.tar.gz | |
<chromium> Update clipboard.h to allow building clipboard_qt.cpp on all platforms
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Change-Id: I5fecc09e245b75d0fec16756f8d6e6b8f71a143e
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | chromium/ui/base/clipboard/clipboard.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chromium/ui/base/clipboard/clipboard.h b/chromium/ui/base/clipboard/clipboard.h index f818bd6a6df..9128a3f1e59 100644 --- a/chromium/ui/base/clipboard/clipboard.h +++ b/chromium/ui/base/clipboard/clipboard.h @@ -88,6 +88,7 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { bool operator<(const FormatType& other) const; #endif +#if !defined(TOOLKIT_QT) #if defined(OS_WIN) const FORMATETC& ToFormatEtc() const { return data_; } #elif defined(OS_MACOSX) @@ -97,6 +98,9 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { #elif defined(USE_AURA) const std::string& ToString() const { return data_; } #endif +#else + const std::string& ToString() const { return data_; } +#endif // !defined(TOOLKIT_QT) bool Equals(const FormatType& other) const; @@ -111,7 +115,10 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { // // Note that in some cases, the accessor for the wrapped descriptor may be // public, as these format types can be used by drag and drop code as well. -#if defined(OS_WIN) +#if defined(TOOLKIT_QT) + explicit FormatType(const std::string& native_format); + std::string data_; +#elif defined(OS_WIN) explicit FormatType(UINT native_format); FormatType(UINT native_format, LONG index); UINT ToUINT() const { return data_.cfFormat; } @@ -339,7 +346,7 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { void WriteData(const FormatType& format, const char* data_data, size_t data_len); -#if defined(OS_WIN) +#if !defined(TOOLKIT_QT) && defined(OS_WIN) void WriteBitmapFromHandle(HBITMAP source_hbitmap, const gfx::Size& size); |