More TOUCH_UI hacks and constant removal. And TODO(saintlou) cleanup.

chrome/browser/bookmarks/bookmark_node_data.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
@@ skipping 175 matching lines @@
 
     elements.clear();
     elements.push_back(element);
     return true;
   }
 
   return false;
 }
 
 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 {
   bookmark_pasteboard_helper_mac::WriteToPasteboard(
       bookmark_pasteboard_helper_mac::kCopyPastePasteboard,
       elements,
       profile_path_.value());
 }
 
 bool BookmarkNodeData::ReadFromClipboard() {
@@ skipping 132 matching lines @@
   DCHECK(profile_path_.empty());
 
   if (profile)
     profile_path_ = profile->GetPath();
 }
 
 bool BookmarkNodeData::IsFromProfile(Profile* profile) const {
   // An empty path means the data is not associated with any profile.
   return !profile_path_.empty() && profile_path_ == profile->GetPath();
 }