summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 20:13:34 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 20:13:34 +0000
commita0c4b343dfa64780f7395d7e3a6e8ebe853a5ec3 (patch)
tree2d1530aeac973e275908b623706d05ceaa39e3c1 /chrome/browser
parent6cfa339931cfe22522d911f0b88603c8350a2135 (diff)
downloadchromium_src-a0c4b343dfa64780f7395d7e3a6e8ebe853a5ec3.zip
chromium_src-a0c4b343dfa64780f7395d7e3a6e8ebe853a5ec3.tar.gz
chromium_src-a0c4b343dfa64780f7395d7e3a6e8ebe853a5ec3.tar.bz2
Fixes bug in pasting bookmarks from the context menu that could result
in inserting into the wrong parent. BUG=40544 TEST=see bug Review URL: http://codereview.chromium.org/2856027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu_controller.cc2
-rw-r--r--chrome/browser/views/bookmark_context_menu_controller_views.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
index 0e5adf1f..96f5b1d 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
@@ -237,7 +237,7 @@ void BookmarkContextMenuController::ExecuteCommand(int id) {
if (!paste_target)
return;
- bookmark_utils::PasteFromClipboard(model_, parent_, index);
+ bookmark_utils::PasteFromClipboard(model_, paste_target, index);
break;
}
diff --git a/chrome/browser/views/bookmark_context_menu_controller_views.cc b/chrome/browser/views/bookmark_context_menu_controller_views.cc
index 9d13c3e..66dfe38 100644
--- a/chrome/browser/views/bookmark_context_menu_controller_views.cc
+++ b/chrome/browser/views/bookmark_context_menu_controller_views.cc
@@ -218,7 +218,7 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
if (!paste_target)
return;
- bookmark_utils::PasteFromClipboard(model, parent_, index);
+ bookmark_utils::PasteFromClipboard(model, paste_target, index);
break;
}