| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/gtk/bookmarks/bookmark_bar_gtk.h" | 5 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| 11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
| 12 #include "base/pickle.h" | 12 #include "base/pickle.h" |
| 13 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
| 14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
| 15 #include "chrome/browser/bookmarks/bookmark_model.h" | 15 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 16 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 16 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 17 #include "chrome/browser/bookmarks/bookmark_node_data.h" | 17 #include "chrome/browser/bookmarks/bookmark_node_data.h" |
| 18 #include "chrome/browser/bookmarks/bookmark_utils.h" | 18 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 19 #include "chrome/browser/browser_shutdown.h" | 19 #include "chrome/browser/browser_shutdown.h" |
| 20 #include "chrome/browser/extensions/extension_service.h" | 20 #include "chrome/browser/extensions/extension_service.h" |
| 21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
| 22 #include "chrome/browser/themes/theme_properties.h" | 22 #include "chrome/browser/themes/theme_properties.h" |
| 23 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" | 23 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" |
| 24 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" |
| 24 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 25 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 25 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
| 26 #include "chrome/browser/ui/chrome_pages.h" | 27 #include "chrome/browser/ui/chrome_pages.h" |
| 27 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h" | 28 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h" |
| 28 #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h" | 29 #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h" |
| 29 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" | 30 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" |
| 30 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 31 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 31 #include "chrome/browser/ui/gtk/custom_button.h" | 32 #include "chrome/browser/ui/gtk/custom_button.h" |
| 32 #include "chrome/browser/ui/gtk/event_utils.h" | 33 #include "chrome/browser/ui/gtk/event_utils.h" |
| 33 #include "chrome/browser/ui/gtk/gtk_chrome_button.h" | 34 #include "chrome/browser/ui/gtk/gtk_chrome_button.h" |
| (...skipping 1267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1301 } | 1302 } |
| 1302 } | 1303 } |
| 1303 | 1304 |
| 1304 switch (target_type) { | 1305 switch (target_type) { |
| 1305 case ui::CHROME_BOOKMARK_ITEM: { | 1306 case ui::CHROME_BOOKMARK_ITEM: { |
| 1306 gint length = gtk_selection_data_get_length(selection_data); | 1307 gint length = gtk_selection_data_get_length(selection_data); |
| 1307 Pickle pickle(reinterpret_cast<const char*>( | 1308 Pickle pickle(reinterpret_cast<const char*>( |
| 1308 gtk_selection_data_get_data(selection_data)), length); | 1309 gtk_selection_data_get_data(selection_data)), length); |
| 1309 BookmarkNodeData drag_data; | 1310 BookmarkNodeData drag_data; |
| 1310 if (drag_data.ReadFromPickle(&pickle)) { | 1311 if (drag_data.ReadFromPickle(&pickle)) { |
| 1311 dnd_success = bookmark_utils::PerformBookmarkDrop( | 1312 dnd_success = chrome::DropBookmarks(browser_->profile(), |
| 1312 browser_->profile(), | 1313 drag_data, dest_node, index) != ui::DragDropTypes::DRAG_NONE; |
| 1313 drag_data, | |
| 1314 dest_node, | |
| 1315 index) != ui::DragDropTypes::DRAG_NONE; | |
| 1316 } | 1314 } |
| 1317 break; | 1315 break; |
| 1318 } | 1316 } |
| 1319 | 1317 |
| 1320 case ui::CHROME_NAMED_URL: { | 1318 case ui::CHROME_NAMED_URL: { |
| 1321 dnd_success = bookmark_utils::CreateNewBookmarkFromNamedUrl( | 1319 dnd_success = bookmark_utils::CreateNewBookmarkFromNamedUrl( |
| 1322 selection_data, model_, dest_node, index); | 1320 selection_data, model_, dest_node, index); |
| 1323 break; | 1321 break; |
| 1324 } | 1322 } |
| 1325 | 1323 |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1467 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() { | 1465 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() { |
| 1468 GtkDestDefaults dest_defaults = | 1466 GtkDestDefaults dest_defaults = |
| 1469 *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL : | 1467 *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL : |
| 1470 GTK_DEST_DEFAULT_DROP; | 1468 GTK_DEST_DEFAULT_DROP; |
| 1471 gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction); | 1469 gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction); |
| 1472 gtk_drag_dest_set(other_bookmarks_button_, dest_defaults, | 1470 gtk_drag_dest_set(other_bookmarks_button_, dest_defaults, |
| 1473 NULL, 0, kDragAction); | 1471 NULL, 0, kDragAction); |
| 1474 ui::SetDestTargetList(overflow_button_, kDestTargetList); | 1472 ui::SetDestTargetList(overflow_button_, kDestTargetList); |
| 1475 ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList); | 1473 ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList); |
| 1476 } | 1474 } |
| OLD | NEW |