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

Unified Diff: chrome/browser/extensions/extension_bookmark_manager_api.cc

Issue 1029004: GTK: implement extension bookmark manager drag api.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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 | « chrome/browser/extensions/extension_bookmark_manager_api.h ('k') | chrome/browser/gtk/bookmark_bar_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_bookmark_manager_api.cc
===================================================================
--- chrome/browser/extensions/extension_bookmark_manager_api.cc (revision 41880)
+++ chrome/browser/extensions/extension_bookmark_manager_api.cc (working copy)
@@ -27,8 +27,6 @@
namespace {
-typedef RenderViewHostDelegate::BookmarkDrag::DragData DragData;
-
// Returns a single bookmark node from the argument ID.
// This returns NULL in case of failure.
const BookmarkNode* GetNodeFromArguments(BookmarkModel* model,
@@ -136,21 +134,6 @@
args->Append(value);
}
-// This is the platform specific function that takes the drag data and creates
-// the BookmarkDragData as needed.
-bool GetBookmarkDragData(const DragData* data,
- BookmarkDragData* bookmark_drag_data) {
-#if defined(TOOLKIT_VIEWS)
- // On TOOLKIT_VIEWS DragData is OSExchangeData.
- return bookmark_drag_data->Read(*data);
-#elif defined(OS_MACOSX)
- return bookmark_drag_data->ReadFromDragClipboard();
-#else
- NOTIMPLEMENTED();
- return false;
-#endif
-}
-
} // namespace
ExtensionBookmarkManagerEventRouter::ExtensionBookmarkManagerEventRouter(
@@ -177,34 +160,38 @@
}
void ExtensionBookmarkManagerEventRouter::DispatchDragEvent(
- const DragData* data, const char* event_name) {
- BookmarkDragData bookmark_drag_data;
- if (::GetBookmarkDragData(data, &bookmark_drag_data)) {
- ListValue args;
- BookmarkDragDataToJSON(profile_, bookmark_drag_data, &args);
- DispatchEvent(event_name, &args);
- }
+ const BookmarkDragData& data, const char* event_name) {
+ if (data.size() == 0)
+ return;
+
+ ListValue args;
+ BookmarkDragDataToJSON(profile_, data, &args);
+ DispatchEvent(event_name, &args);
}
-void ExtensionBookmarkManagerEventRouter::OnDragEnter(const DragData* data) {
+void ExtensionBookmarkManagerEventRouter::OnDragEnter(
+ const BookmarkDragData& data) {
DispatchDragEvent(data, keys::kOnBookmarkDragEnter);
}
-void ExtensionBookmarkManagerEventRouter::OnDragOver(const DragData* data) {
+void ExtensionBookmarkManagerEventRouter::OnDragOver(
+ const BookmarkDragData& data) {
// Intentionally empty since these events happens too often and floods the
// message queue. We do not need this event for the bookmark manager anyway.
}
-void ExtensionBookmarkManagerEventRouter::OnDragLeave(const DragData* data) {
+void ExtensionBookmarkManagerEventRouter::OnDragLeave(
+ const BookmarkDragData& data) {
DispatchDragEvent(data, keys::kOnBookmarkDragLeave);
}
-void ExtensionBookmarkManagerEventRouter::OnDrop(const DragData* data) {
+void ExtensionBookmarkManagerEventRouter::OnDrop(
+ const BookmarkDragData& data) {
DispatchDragEvent(data, keys::kOnBookmarkDrop);
// Make a copy that is owned by this instance.
ClearBookmarkDragData();
- ::GetBookmarkDragData(data, &bookmark_drag_data_);
+ bookmark_drag_data_ = data;
}
const BookmarkDragData*
« no previous file with comments | « chrome/browser/extensions/extension_bookmark_manager_api.h ('k') | chrome/browser/gtk/bookmark_bar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698