diff options
author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 18:37:14 +0000 |
---|---|---|
committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 18:37:14 +0000 |
commit | b2aa3ed777110d64e6647285fc3650bd5455681c (patch) | |
tree | d738ea5089cc1b6bd6b09e51fc9da672c912bc99 /chrome/browser/bookmarks/bookmark_utils.cc | |
parent | 70f2c448125ebe327d97596af088d8e81e82b901 (diff) | |
download | chromium_src-b2aa3ed777110d64e6647285fc3650bd5455681c.zip chromium_src-b2aa3ed777110d64e6647285fc3650bd5455681c.tar.gz chromium_src-b2aa3ed777110d64e6647285fc3650bd5455681c.tar.bz2 |
BSD port: chrome/app and chrome/browser ifdef cleaning
Review URL: http://codereview.chromium.org/548203
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_utils.cc')
-rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 2d21acc..e35c55c 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -354,7 +354,8 @@ void OpenAll(gfx::NativeWindow parent, void CopyToClipboard(BookmarkModel* model, const std::vector<const BookmarkNode*>& nodes, bool remove_nodes) { -#if defined(OS_WIN) || defined(OS_LINUX) +// Not implemented on mac yet. +#if !defined(OS_MACOSX) if (nodes.empty()) return; @@ -366,15 +367,14 @@ void CopyToClipboard(BookmarkModel* model, nodes[i]->GetParent()->IndexOfChild(nodes[i])); } } -#else - // Not implemented on mac yet. #endif } void PasteFromClipboard(BookmarkModel* model, const BookmarkNode* parent, int index) { -#if defined(OS_WIN) || defined(OS_LINUX) +// Not implemented on mac yet. +#if !defined(OS_MACOSX) if (!parent) return; @@ -385,8 +385,6 @@ void PasteFromClipboard(BookmarkModel* model, if (index == -1) index = parent->GetChildCount(); bookmark_utils::CloneDragData(model, bookmark_data.elements, parent, index); -#else - // Not implemented on mac yet. #endif } |