diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 23:28:29 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 23:28:29 +0000 |
| commit | ff53be65f85e67b06d05f91c7c69a47ac7517625 (patch) | |
| tree | 3116ab4bcbdcb08b8e04c0fef6a0909a2a906481 /chrome/browser/bookmarks/bookmark_node_data.cc | |
| parent | 83ce153a1498beadb8415fac34d1465d160a4521 (diff) | |
| download | chromium_src-ff53be65f85e67b06d05f91c7c69a47ac7517625.zip chromium_src-ff53be65f85e67b06d05f91c7c69a47ac7517625.tar.gz chromium_src-ff53be65f85e67b06d05f91c7c69a47ac7517625.tar.bz2 | |
Make Clipboard::FormatType an opaque handle type.
BUG=106523
TEST=ui_unittests --gtest_filter=ClipboardTest.* and manual testing
Review URL: http://codereview.chromium.org/8801038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_node_data.cc')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_node_data.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc index eb12b98c..6ddf3bd 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.cc +++ b/chrome/browser/bookmarks/bookmark_node_data.cc @@ -161,13 +161,15 @@ void BookmarkNodeData::WriteToClipboard(Profile* profile) const { Pickle pickle; WriteToPickle(profile, &pickle); - scw.WritePickledData(pickle, kClipboardFormatString); + scw.WritePickledData( + pickle, ui::Clipboard::GetFormatType(kClipboardFormatString)); } bool BookmarkNodeData::ReadFromClipboard() { std::string data; ui::Clipboard* clipboard = g_browser_process->clipboard(); - clipboard->ReadData(kClipboardFormatString, &data); + clipboard->ReadData(ui::Clipboard::GetFormatType(kClipboardFormatString), + &data); if (!data.empty()) { Pickle pickle(data.data(), data.size()); @@ -193,8 +195,9 @@ bool BookmarkNodeData::ReadFromClipboard() { } bool BookmarkNodeData::ClipboardContainsBookmarks() { - return g_browser_process->clipboard()->IsFormatAvailableByString( - BookmarkNodeData::kClipboardFormatString, ui::Clipboard::BUFFER_STANDARD); + return g_browser_process->clipboard()->IsFormatAvailable( + ui::Clipboard::GetFormatType(kClipboardFormatString), + ui::Clipboard::BUFFER_STANDARD); } #else void BookmarkNodeData::WriteToClipboard(Profile* profile) const { |