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

Unified Diff: chrome/browser/gtk/bookmark_utils_gtk.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/gtk/bookmark_utils_gtk.h ('k') | chrome/browser/gtk/custom_drag.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/bookmark_utils_gtk.cc
===================================================================
--- chrome/browser/gtk/bookmark_utils_gtk.cc (revision 41880)
+++ chrome/browser/gtk/bookmark_utils_gtk.cc (working copy)
@@ -198,6 +198,16 @@
// DnD-related -----------------------------------------------------------------
+int GetCodeMask(bool folder) {
+ int rv = gtk_dnd_util::CHROME_BOOKMARK_ITEM;
+ if (!folder) {
+ rv |= gtk_dnd_util::TEXT_URI_LIST |
+ gtk_dnd_util::TEXT_PLAIN |
+ gtk_dnd_util::NETSCAPE_URL;
+ }
+ return rv;
+}
+
void WriteBookmarkToSelection(const BookmarkNode* node,
GtkSelectionData* selection_data,
guint target_type,
@@ -272,17 +282,19 @@
Profile* profile,
gboolean* delete_selection_data,
gboolean* dnd_success) {
- *delete_selection_data = FALSE;
- *dnd_success = FALSE;
+ if (delete_selection_data)
+ *delete_selection_data = FALSE;
+ if (dnd_success)
+ *dnd_success = FALSE;
if ((selection_data != NULL) && (selection_data->length >= 0)) {
- if (context->action == GDK_ACTION_MOVE) {
+ if (context && delete_selection_data && context->action == GDK_ACTION_MOVE)
*delete_selection_data = TRUE;
- }
switch (target_type) {
case gtk_dnd_util::CHROME_BOOKMARK_ITEM: {
- *dnd_success = TRUE;
+ if (dnd_success)
+ *dnd_success = TRUE;
Pickle pickle(reinterpret_cast<char*>(selection_data->data),
selection_data->length);
BookmarkDragData drag_data;
« no previous file with comments | « chrome/browser/gtk/bookmark_utils_gtk.h ('k') | chrome/browser/gtk/custom_drag.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698