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

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

Issue 8196001: content: Split web_drag_dest_gtk.cc into chrome/ and content/ parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: :( Created 9 years, 2 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
Index: chrome/browser/bookmarks/bookmark_node_data.cc
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc
index 91511240ea2479c97fad3743732052050139d9a4..5af0809ea84e4fb1280ee1fc49eb93aa329c9223 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data.cc
@@ -15,6 +15,7 @@
#include "chrome/common/url_constants.h"
#include "net/base/escape.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/base/dragdrop/bookmark_format.h"
#if defined(OS_MACOSX)
#include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
@@ -22,9 +23,6 @@
#include "chrome/browser/browser_process.h"
#endif
-const char* BookmarkNodeData::kClipboardFormatString =
- "chromium/x-bookmark-entries";
-
BookmarkNodeData::Element::Element() : is_url(false), id_(0) {
}
@@ -79,21 +77,6 @@ bool BookmarkNodeData::Element::ReadFromPickle(Pickle* pickle,
return true;
}
-#if defined(TOOLKIT_VIEWS)
-// static
-ui::OSExchangeData::CustomFormat BookmarkNodeData::GetBookmarkCustomFormat() {
- static ui::OSExchangeData::CustomFormat format;
- static bool format_valid = false;
-
- if (!format_valid) {
- format_valid = true;
- format = ui::OSExchangeData::RegisterCustomFormat(
- BookmarkNodeData::kClipboardFormatString);
- }
- return format;
-}
-#endif
-
BookmarkNodeData::BookmarkNodeData() {
}
@@ -161,13 +144,13 @@ void BookmarkNodeData::WriteToClipboard(Profile* profile) const {
Pickle pickle;
WriteToPickle(profile, &pickle);
- scw.WritePickledData(pickle, kClipboardFormatString);
+ scw.WritePickledData(pickle, ui::kClipboardFormatString);
}
bool BookmarkNodeData::ReadFromClipboard() {
std::string data;
ui::Clipboard* clipboard = g_browser_process->clipboard();
- clipboard->ReadData(kClipboardFormatString, &data);
+ clipboard->ReadData(ui::kClipboardFormatString, &data);
if (!data.empty()) {
Pickle pickle(data.data(), data.size());
@@ -200,7 +183,7 @@ bool BookmarkNodeData::ClipboardContainsBookmarks() {
return false;
#else
return g_browser_process->clipboard()->IsFormatAvailableByString(
- BookmarkNodeData::kClipboardFormatString, ui::Clipboard::BUFFER_STANDARD);
+ ui::kClipboardFormatString, ui::Clipboard::BUFFER_STANDARD);
#endif
}
#else
@@ -249,7 +232,7 @@ void BookmarkNodeData::Write(Profile* profile, ui::OSExchangeData* data) const {
Pickle data_pickle;
WriteToPickle(profile, &data_pickle);
- data->SetPickledData(GetBookmarkCustomFormat(), data_pickle);
+ data->SetPickledData(ui::GetBookmarkCustomFormat(), data_pickle);
}
bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
@@ -257,9 +240,9 @@ bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
profile_path_.clear();
- if (data.HasCustomFormat(GetBookmarkCustomFormat())) {
+ if (data.HasCustomFormat(ui::GetBookmarkCustomFormat())) {
Pickle drag_data_pickle;
- if (data.GetPickledData(GetBookmarkCustomFormat(), &drag_data_pickle)) {
+ if (data.GetPickledData(ui::GetBookmarkCustomFormat(), &drag_data_pickle)) {
if (!ReadFromPickle(&drag_data_pickle))
return false;
}

Powered by Google App Engine
This is Rietveld 408576698