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

Unified Diff: chrome/browser/bookmarks/bookmark_node_data.cc

Issue 8669002: More TOUCH_UI hacks and constant removal. And TODO(saintlou) cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « no previous file | chrome/browser/bookmarks/bookmark_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698