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

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

Issue 368973003: MacViews: Partially implement OSExchangeDataProviderMac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for dcheng and tapted. Created 6 years, 5 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
Index: ui/base/clipboard/clipboard.h
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index 9474847861484aaf024fe8272f104a8038fa1e2c..afc875341ab4a748977bc700248efc8686ee579c 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -91,6 +91,7 @@ class UI_BASE_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
#elif defined(USE_AURA)
const std::string& ToString() const { return data_; }
#elif defined(OS_MACOSX)
+ NSString* ToNSString() const { return data_; }
// Custom copy and assignment constructor to handle NSString.
FormatType(const FormatType& other);
FormatType& operator=(const FormatType& other);
@@ -120,7 +121,6 @@ class UI_BASE_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
std::string data_;
#elif defined(OS_MACOSX)
explicit FormatType(NSString* native_format);
- NSString* ToNSString() const { return data_; }
NSString* data_;
#elif defined(OS_ANDROID)
explicit FormatType(const std::string& native_format);
« no previous file with comments | « no previous file | ui/base/dragdrop/os_exchange_data_provider_mac.h » ('j') | ui/base/dragdrop/os_exchange_data_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698