| Index: chrome/browser/bookmarks/bookmark_node_data.cc
|
| diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc
|
| index 49ba01b9be2588e9000ceaa0d8e170d53cbc58db..eb12b98cfcc9e72e15c16a6b97e619aecbcdcdd9 100644
|
| --- a/chrome/browser/bookmarks/bookmark_node_data.cc
|
| +++ b/chrome/browser/bookmarks/bookmark_node_data.cc
|
| @@ -193,15 +193,8 @@ bool BookmarkNodeData::ReadFromClipboard() {
|
| }
|
|
|
| bool BookmarkNodeData::ClipboardContainsBookmarks() {
|
| -#if defined(TOUCH_UI)
|
| - // Temporarily disabling clipboard due to bug 96448.
|
| - // TODO(wyck): Reenable when cause of message loop hang in
|
| - // gtk_clipboard_wait_for_contents is determined and fixed.
|
| - return false;
|
| -#else
|
| return g_browser_process->clipboard()->IsFormatAvailableByString(
|
| BookmarkNodeData::kClipboardFormatString, ui::Clipboard::BUFFER_STANDARD);
|
| -#endif
|
| }
|
| #else
|
| void BookmarkNodeData::WriteToClipboard(Profile* profile) const {
|
|
|