Add overrides for BookmarkModel clipboard interface on iOS

components/bookmarks/core/browser/bookmark_node_data.cc

Index: components/bookmarks/core/browser/bookmark_node_data.cc
diff --git a/components/bookmarks/core/browser/bookmark_node_data.cc b/components/bookmarks/core/browser/bookmark_node_data.cc
index 0e356eb2942613a2a84020a13ef69faaa424af52..a22054b37b50228e0682e3cd363b5d2b53b4ab0d 100644
--- a/components/bookmarks/core/browser/bookmark_node_data.cc
+++ b/components/bookmarks/core/browser/bookmark_node_data.cc
@@ -112,14 +112,14 @@ BookmarkNodeData::BookmarkNodeData(
 BookmarkNodeData::~BookmarkNodeData() {
 }
 
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_IOS)

[blundell, 2014/05/05 12:32:18]

This is unnecessary: OS_MACOSX is defined when OS_IOS is defined.

[sdefresne, 2014/05/05 14:45:50]

Done.

 // static
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
   return ui::Clipboard::GetForCurrentThread()->IsFormatAvailable(
       ui::Clipboard::GetFormatType(kClipboardFormatString),
       ui::CLIPBOARD_TYPE_COPY_PASTE);
 }
-#endif
+#endif  // !defined(OS_MACOSX) && !defined(OS_IOS)
 
 bool BookmarkNodeData::ReadFromVector(
     const std::vector<const BookmarkNode*>& nodes) {
@@ -150,7 +150,7 @@ bool BookmarkNodeData::ReadFromTuple(const GURL& url, const base::string16& titl
   return true;
 }
 
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_IOS)
 void BookmarkNodeData::WriteToClipboard(ui::ClipboardType clipboard_type) {
   DCHECK(clipboard_type == ui::CLIPBOARD_TYPE_COPY_PASTE ||
          clipboard_type == ui::CLIPBOARD_TYPE_SELECTION);
@@ -212,7 +212,7 @@ bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) {
 
   return false;
 }
-#endif
+#endif  // !defined(OS_MACOSX) && !defined(OS_IOS)
 
 void BookmarkNodeData::WriteToPickle(const base::FilePath& profile_path,
                                      Pickle* pickle) const {