Index: ui/base/clipboard/clipboard.h |
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h |
index a3e9181088e2a221c0bc731af5c1e7ea65151897..e73fc8f618af1a3e49296d062b09e3b80b49af1e 100644 |
--- a/ui/base/clipboard/clipboard.h |
+++ b/ui/base/clipboard/clipboard.h |
@@ -172,7 +172,7 @@ class UI_EXPORT Clipboard { |
// as a byte vector. |
// TODO(dcheng): Due to platform limitations on Windows, we should make sure |
// format is never controlled by the user. |
- void ReadData(const std::string& format, std::string* result); |
+ void ReadData(const std::string& format, std::string* result) const; |
// Get format Identifiers for various types. |
static FormatType GetUrlFormatType(); |
@@ -225,12 +225,10 @@ class UI_EXPORT Clipboard { |
void WriteBitmap(const char* pixel_data, const char* size_data); |
-#if !defined(OS_MACOSX) |
// |format_name| is an ASCII string and should be NULL-terminated. |
// TODO(estade): port to mac. |
tony
2011/12/05 18:56:09
Nit: Get rid of the TODO.
dcheng
2011/12/05 19:53:03
Done.
|
void WriteData(const char* format_name, size_t format_len, |
const char* data_data, size_t data_len); |
-#endif |
#if defined(OS_WIN) |
void WriteBitmapFromHandle(HBITMAP source_hbitmap, |
const gfx::Size& size); |