diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-18 14:49:48 +0100 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-28 14:48:14 +0100 |
| commit | 9001f7258c97c6fe61d6362aa3431af7128f9218 (patch) | |
| tree | d13aff7366f96f4973c46e18a4714614eb35d918 | |
| parent | 002eaa024104d6135d82d921ca4a5b4b673a9d81 (diff) | |
| download | qtwebengine-chromium-9001f7258c97c6fe61d6362aa3431af7128f9218.tar.gz | |
Update clipboard.h to allow building clipboard_qt.cpp on all platforms
Note: This does not build on Windows yet.
Change-Id: Ife754b2fcb1c1a535565facdbab615c07b8c4935
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | chromium/ui/base/clipboard/clipboard.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chromium/ui/base/clipboard/clipboard.h b/chromium/ui/base/clipboard/clipboard.h index 94cd664e3fb..4e4791d9cd0 100644 --- a/chromium/ui/base/clipboard/clipboard.h +++ b/chromium/ui/base/clipboard/clipboard.h @@ -87,6 +87,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) @@ -96,6 +97,7 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { #elif defined(USE_AURA) const std::string& ToString() const { return data_; } #endif +#endif // TOOLKIT_QT private: friend class Clipboard; @@ -110,7 +112,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; } |