Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3869)

Unified Diff: chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm

Issue 9692020: mac: Don't use kWebURLsWithTitlesPboardType from third_party/mozilla (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/url_drop_target.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
index 94cc38e90ce64cb39c81c232de84e5aa92d184c1..eae36eb6352115c8dc24d82f5a2250e538c6d828 100644
--- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
+++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
@@ -39,7 +39,7 @@ NSString* const kChromiumBookmarkId =
// Mac WebKit uses this type, declared in
// WebKit/mac/History/WebURLsWithTitles.h.
-NSString* const kWebURLsWithTitlesPboardType =
+NSString* const kCrWebURLsWithTitlesPboardType =
@"WebURLsWithTitlesPboardType";
// Keys for the type of node in BookmarkDictionaryListPboardType.
@@ -99,7 +99,7 @@ bool ReadWebURLsWithTitlesPboardType(
NSPasteboard* pb,
std::vector<BookmarkNodeData::Element>& elements) {
NSArray* bookmarkPairs =
- [pb propertyListForType:kWebURLsWithTitlesPboardType];
+ [pb propertyListForType:kCrWebURLsWithTitlesPboardType];
if (![bookmarkPairs isKindOfClass:[NSArray class]])
return false;
@@ -215,7 +215,7 @@ void WriteSimplifiedBookmarkTypes(NSPasteboard* pb,
// Write WebURLsWithTitlesPboardType.
[pb setPropertyList:[NSArray arrayWithObjects:urls, titles, nil]
- forType:kWebURLsWithTitlesPboardType];
+ forType:kCrWebURLsWithTitlesPboardType];
// Write NSStringPboardType.
[pb setString:[urls componentsJoinedByString:@"\n"]
@@ -308,7 +308,7 @@ void WriteToPasteboard(PasteboardType type,
NSPasteboard* pb = PasteboardFromType(type);
NSArray* types = [NSArray arrayWithObjects:kBookmarkDictionaryListPboardType,
- kWebURLsWithTitlesPboardType,
+ kCrWebURLsWithTitlesPboardType,
NSStringPboardType,
NSURLPboardType,
kNSURLTitlePboardType,
@@ -339,7 +339,7 @@ bool PasteboardContainsBookmarks(PasteboardType type) {
NSArray* availableTypes =
[NSArray arrayWithObjects:kBookmarkDictionaryListPboardType,
- kWebURLsWithTitlesPboardType,
+ kCrWebURLsWithTitlesPboardType,
NSURLPboardType,
nil];
return [pb availableTypeFromArray:availableTypes] != nil;
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/url_drop_target.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698