diff options
Diffstat (limited to 'chromium/ui/base/clipboard/clipboard.h')
| -rw-r--r-- | chromium/ui/base/clipboard/clipboard.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/chromium/ui/base/clipboard/clipboard.h b/chromium/ui/base/clipboard/clipboard.h index 5cf936cdd6f..f818bd6a6df 100644 --- a/chromium/ui/base/clipboard/clipboard.h +++ b/chromium/ui/base/clipboard/clipboard.h @@ -88,7 +88,6 @@ 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) @@ -98,15 +97,12 @@ 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; private: friend class Clipboard; - bool Equals(const FormatType& other) const; - // Platform-specific glue used internally by the Clipboard class. Each // plaform should define,at least one of each of the following: // 1. A constructor that wraps that native clipboard format descriptor. @@ -115,10 +111,7 @@ 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(TOOLKIT_QT) - explicit FormatType(const std::string& native_format); - std::string data_; -#elif defined(OS_WIN) +#if defined(OS_WIN) explicit FormatType(UINT native_format); FormatType(UINT native_format, LONG index); UINT ToUINT() const { return data_.cfFormat; } @@ -346,7 +339,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(TOOLKIT_QT) && defined(OS_WIN) +#if defined(OS_WIN) void WriteBitmapFromHandle(HBITMAP source_hbitmap, const gfx::Size& size); |