| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/gtk/bookmark_menu_controller_gtk.h" | 5 #include "chrome/browser/gtk/bookmark_menu_controller_gtk.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| 11 #include "base/gfx/gtk_util.h" | 11 #include "base/gfx/gtk_util.h" |
| 12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 13 #include "chrome/browser/gtk/bookmark_context_menu.h" | 13 #include "chrome/browser/gtk/bookmark_context_menu.h" |
| 14 #include "chrome/browser/gtk/bookmark_utils_gtk.h" | 14 #include "chrome/browser/gtk/bookmark_utils_gtk.h" |
| 15 #include "chrome/browser/gtk/dnd_registry.h" | 15 #include "chrome/browser/gtk/gtk_dnd_util.h" |
| 16 #include "chrome/browser/gtk/menu_gtk.h" | 16 #include "chrome/browser/gtk/menu_gtk.h" |
| 17 #include "chrome/browser/profile.h" | 17 #include "chrome/browser/profile.h" |
| 18 #include "chrome/browser/tab_contents/page_navigator.h" | 18 #include "chrome/browser/tab_contents/page_navigator.h" |
| 19 #include "chrome/common/gtk_util.h" | 19 #include "chrome/common/gtk_util.h" |
| 20 #include "grit/app_resources.h" | 20 #include "grit/app_resources.h" |
| 21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 22 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
| 23 #include "webkit/glue/window_open_disposition.h" | 23 #include "webkit/glue/window_open_disposition.h" |
| 24 | 24 |
| 25 namespace { | 25 namespace { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 128 |
| 129 GtkWidget* submenu = gtk_menu_new(); | 129 GtkWidget* submenu = gtk_menu_new(); |
| 130 BuildMenu(node, 0, submenu); | 130 BuildMenu(node, 0, submenu); |
| 131 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu); | 131 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu); |
| 132 } else { | 132 } else { |
| 133 NOTREACHED(); | 133 NOTREACHED(); |
| 134 } | 134 } |
| 135 | 135 |
| 136 gtk_drag_source_set(menu_item, GDK_BUTTON1_MASK, | 136 gtk_drag_source_set(menu_item, GDK_BUTTON1_MASK, |
| 137 NULL, 0, GDK_ACTION_MOVE); | 137 NULL, 0, GDK_ACTION_MOVE); |
| 138 dnd::SetSourceTargetListFromCodeMask(menu_item, | 138 GtkDndUtil::SetSourceTargetListFromCodeMask( |
| 139 dnd::X_CHROME_BOOKMARK_ITEM); | 139 menu_item, GtkDndUtil::X_CHROME_BOOKMARK_ITEM); |
| 140 g_signal_connect(G_OBJECT(menu_item), "drag-begin", | 140 g_signal_connect(G_OBJECT(menu_item), "drag-begin", |
| 141 G_CALLBACK(&OnMenuItemDragBegin), this); | 141 G_CALLBACK(&OnMenuItemDragBegin), this); |
| 142 g_signal_connect(G_OBJECT(menu_item), "drag-end", | 142 g_signal_connect(G_OBJECT(menu_item), "drag-end", |
| 143 G_CALLBACK(&OnMenuItemDragEnd), this); | 143 G_CALLBACK(&OnMenuItemDragEnd), this); |
| 144 g_signal_connect(G_OBJECT(menu_item), "drag-data-get", | 144 g_signal_connect(G_OBJECT(menu_item), "drag-data-get", |
| 145 G_CALLBACK(&OnMenuItemDragGet), this); | 145 G_CALLBACK(&OnMenuItemDragGet), this); |
| 146 | 146 |
| 147 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); | 147 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); |
| 148 node_to_menu_widget_map_[node] = menu_item; | 148 node_to_menu_widget_map_[node] = menu_item; |
| 149 } | 149 } |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 // static | 246 // static |
| 247 void BookmarkMenuController::OnMenuItemDragGet( | 247 void BookmarkMenuController::OnMenuItemDragGet( |
| 248 GtkWidget* widget, GdkDragContext* context, | 248 GtkWidget* widget, GdkDragContext* context, |
| 249 GtkSelectionData* selection_data, | 249 GtkSelectionData* selection_data, |
| 250 guint target_type, guint time, | 250 guint target_type, guint time, |
| 251 BookmarkMenuController* controller) { | 251 BookmarkMenuController* controller) { |
| 252 const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget); | 252 const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget); |
| 253 bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type, | 253 bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type, |
| 254 controller->profile_); | 254 controller->profile_); |
| 255 } | 255 } |
| OLD | NEW |