diff options
| author | tfarina <tfarina@chromium.org> | 2014-12-22 04:53:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 12:54:27 +0000 |
| commit | 6d64e0d964b8b8d8d96146a14cec67312cc48226 (patch) | |
| tree | f75a27ad420b1deb394dda2e56cbbbfd40e7aa35 /components/bookmarks | |
| parent | b4d8c5487459bcdfb6038bafc0a7bfebb9628fec (diff) | |
| download | chromium_src-6d64e0d964b8b8d8d96146a14cec67312cc48226.zip chromium_src-6d64e0d964b8b8d8d96146a14cec67312cc48226.tar.gz chromium_src-6d64e0d964b8b8d8d96146a14cec67312cc48226.tar.bz2 | |
bookmarks: Move bookmark_pasteboard_helper_mac functions into 'bookmarks' namespace.
BUG=370433
TEST=unit_tests, components_unittests
R=avi@chromium.org
Review URL: https://codereview.chromium.org/814833007
Cr-Commit-Position: refs/heads/master@{#309417}
Diffstat (limited to 'components/bookmarks')
| -rw-r--r-- | components/bookmarks/browser/bookmark_pasteboard_helper_mac.h | 8 | ||||
| -rw-r--r-- | components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h index a382258..c043418 100644 --- a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h +++ b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h @@ -15,25 +15,29 @@ namespace base { class FilePath; } +namespace bookmarks { + // This set of functions lets C++ code interact with the cocoa pasteboard and // dragging methods. // Writes a set of bookmark elements from a profile to the specified pasteboard. void WriteBookmarksToPasteboard( ui::ClipboardType type, - const std::vector<bookmarks::BookmarkNodeData::Element>& elements, + const std::vector<BookmarkNodeData::Element>& elements, const base::FilePath& profile_path); // Reads a set of bookmark elements from the specified pasteboard. bool ReadBookmarksFromPasteboard( ui::ClipboardType type, - std::vector<bookmarks::BookmarkNodeData::Element>& elements, + 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(ui::ClipboardType type); +} // namespace bookmarks + #if defined(__OBJC__) // Pasteboard type for dictionary containing bookmark structure consisting // of individual bookmark nodes and/or bookmark folders. diff --git a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm index 204e463..7f39060 100644 --- a/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm +++ b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm @@ -11,11 +11,11 @@ #include "components/bookmarks/browser/bookmark_node.h" #include "ui/base/clipboard/clipboard.h" -using bookmarks::BookmarkNodeData; - NSString* const kBookmarkDictionaryListPboardType = @"BookmarkDictionaryListPboardType"; +namespace bookmarks { + namespace { // An unofficial standard pasteboard title type to be provided alongside the @@ -331,3 +331,5 @@ bool PasteboardContainsBookmarks(ui::ClipboardType type) { nil]; return [pb availableTypeFromArray:availableTypes] != nil; } + +} // namespace bookmarks |