bookmarks: bookmark_pasteboard_helper_mac.h misc clean ups.

- Move functions into global namespace.
- Rename the PasteboardType enum to BookmarkPasteboardType.
- Make BookmarkPasteboardType enum follow the content convention.
- Inline dragClipboardContainsBookmarks() directly into the call sites.

BUG=35966, 289619
TEST=None, no functional changes.
R=asvitkine@google.com, sky@chromium.org, asvitkine@chromium.org

Review URL: https://codereview.chromium.org/24916003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225862 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 19 deletions

diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h
index c0dd000..dd68ec0 100644
--- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h
+++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h
@@ -15,31 +15,29 @@ namespace base {
 class FilePath;
 }
 
-// This set of functions lets C++ code interact with the cocoa pasteboard
-// and dragging methods.
-namespace bookmark_pasteboard_helper_mac {
+// This set of functions lets C++ code interact with the cocoa pasteboard and
+// dragging methods.
 
-enum PasteboardType {
-  kCopyPastePasteboard,
-  kDragPasteboard
+enum BookmarkPasteboardType {
+  BOOKMARK_PASTEBOARD_TYPE_COPY_PASTE,
+  BOOKMARK_PASTEBOARD_TYPE_DRAG
 };
 
 // Writes a set of bookmark elements from a profile to the specified pasteboard.
-void WriteToPasteboard(PasteboardType type,
-                       const std::vector<BookmarkNodeData::Element>& elements,
-                       const base::FilePath& profile_path);
+void WriteBookmarksToPasteboard(
+    BookmarkPasteboardType type,
+    const std::vector<BookmarkNodeData::Element>& elements,
+    const base::FilePath& profile_path);
 
 // Reads a set of bookmark elements from the specified pasteboard.
-bool ReadFromPasteboard(PasteboardType type,
-                        std::vector<BookmarkNodeData::Element>& elements,
-                        base::FilePath* profile_path);
-
-// Returns true if the specified pasteboard contains any sort of
-// bookmark elements.  It currently does not consider a plaintext url a
-// valid bookmark.
-bool PasteboardContainsBookmarks(PasteboardType type);
-
-}  // namespace bookmark_pasteboard_helper_mac
+bool ReadBookmarksFromPasteboard(
+    BookmarkPasteboardType type,
+    std::vector<BookmarkNodeData::Element>& elements,
+    base::FilePath* profile_path);
+
+// Returns true if the specified pasteboard contains any sort of bookmark
+// elements. It currently does not consider a plaintext url a valid bookmark.
+bool PasteboardContainsBookmarks(BookmarkPasteboardType type);
 
 #if defined(__OBJC__)
 // Pasteboard type for dictionary containing bookmark structure consisting