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

Unified Diff: chrome/browser/bookmarks/bookmark_node_data.h

Issue 199763002: Verify FormatType in ScopedClipboardWriter::WritePickledData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Linux GTK Created 6 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/bookmarks/bookmark_node_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_node_data.h
diff --git a/chrome/browser/bookmarks/bookmark_node_data.h b/chrome/browser/bookmarks/bookmark_node_data.h
index fbb975ea244b63142b2535309b7418da1560dd79..95f55d730ea90e74224539b622f196ca0c04cb64 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.h
+++ b/chrome/browser/bookmarks/bookmark_node_data.h
@@ -11,6 +11,7 @@
#include "base/strings/string16.h"
#include "base/time/time.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/clipboard_types.h"
#include "url/gurl.h"
@@ -81,8 +82,8 @@ struct BookmarkNodeData {
int64 id_;
};
- // The MIME type for the clipboard format for BookmarkNodeData.
- static const char* kClipboardFormatString;
+ // The Bookmark format type for BookmarkNodeData.
+ static const ui::Clipboard::FormatType& GetFormatType();
BookmarkNodeData();
@@ -92,10 +93,6 @@ struct BookmarkNodeData {
~BookmarkNodeData();
-#if defined(TOOLKIT_VIEWS)
- static const ui::OSExchangeData::CustomFormat& GetBookmarkCustomFormat();
-#endif
-
static bool ClipboardContainsBookmarks();
// Reads bookmarks from the given vector.
« no previous file with comments | « no previous file | chrome/browser/bookmarks/bookmark_node_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698