Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Unified Diff: ui/base/clipboard/clipboard.h

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix resolve Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/window_tree_host.h ('k') | ui/base/clipboard/clipboard_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard.h
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index 8b6e2ce8d5a8409e247857fe1befa15b9f47b2f7..45dc127fce2edd8292322af72d2082d62add0e30 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -90,12 +90,12 @@ class UI_BASE_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
#if defined(OS_WIN)
const FORMATETC& ToFormatEtc() const { return data_; }
+#elif defined(USE_AURA)
+ const std::string& ToString() const { return data_; }
#elif defined(OS_MACOSX)
// Custom copy and assignment constructor to handle NSString.
FormatType(const FormatType& other);
FormatType& operator=(const FormatType& other);
-#elif defined(USE_AURA)
- const std::string& ToString() const { return data_; }
#endif
private:
@@ -116,13 +116,13 @@ class UI_BASE_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
FormatType(UINT native_format, LONG index);
UINT ToUINT() const { return data_.cfFormat; }
FORMATETC data_;
+#elif defined(USE_AURA)
+ explicit FormatType(const std::string& native_format);
+ std::string data_;
#elif defined(OS_MACOSX)
explicit FormatType(NSString* native_format);
NSString* ToNSString() const { return data_; }
NSString* data_;
-#elif defined(USE_AURA)
- explicit FormatType(const std::string& native_format);
- std::string data_;
#elif defined(TOOLKIT_GTK)
explicit FormatType(const std::string& native_format);
explicit FormatType(const GdkAtom& native_format);
« no previous file with comments | « ui/aura/window_tree_host.h ('k') | ui/base/clipboard/clipboard_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698