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/extensions/api/bookmark_manager_private/bookmark_manage
r_private_api.h" | 5 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manage
r_private_api.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/memory/linked_ptr.h" | 10 #include "base/memory/linked_ptr.h" |
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 CHECK(web_ui); | 587 CHECK(web_ui); |
588 BookmarkManagerPrivateDragEventRouter* router = | 588 BookmarkManagerPrivateDragEventRouter* router = |
589 web_ui->bookmark_manager_private_drag_event_router(); | 589 web_ui->bookmark_manager_private_drag_event_router(); |
590 | 590 |
591 DCHECK(router); | 591 DCHECK(router); |
592 const BookmarkNodeData* drag_data = router->GetBookmarkNodeData(); | 592 const BookmarkNodeData* drag_data = router->GetBookmarkNodeData(); |
593 if (drag_data == NULL) { | 593 if (drag_data == NULL) { |
594 NOTREACHED() <<"Somehow we're dropping null bookmark data"; | 594 NOTREACHED() <<"Somehow we're dropping null bookmark data"; |
595 return false; | 595 return false; |
596 } | 596 } |
597 chrome::DropBookmarks(GetProfile(), *drag_data, drop_parent, drop_index); | 597 const bool copy = false; |
| 598 chrome::DropBookmarks( |
| 599 GetProfile(), *drag_data, drop_parent, drop_index, copy); |
598 | 600 |
599 router->ClearBookmarkNodeData(); | 601 router->ClearBookmarkNodeData(); |
600 return true; | 602 return true; |
601 } else { | 603 } else { |
602 NOTREACHED(); | 604 NOTREACHED(); |
603 return false; | 605 return false; |
604 } | 606 } |
605 } | 607 } |
606 | 608 |
607 bool BookmarkManagerPrivateGetSubtreeFunction::RunOnReady() { | 609 bool BookmarkManagerPrivateGetSubtreeFunction::RunOnReady() { |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
790 result.enabled = undo_manager->redo_count() > 0; | 792 result.enabled = undo_manager->redo_count() > 0; |
791 result.label = base::UTF16ToUTF8(undo_manager->GetRedoLabel()); | 793 result.label = base::UTF16ToUTF8(undo_manager->GetRedoLabel()); |
792 | 794 |
793 results_ = RedoInfo::Results::Create(result); | 795 results_ = RedoInfo::Results::Create(result); |
794 #endif // !defined(OS_ANDROID) | 796 #endif // !defined(OS_ANDROID) |
795 | 797 |
796 return true; | 798 return true; |
797 } | 799 } |
798 | 800 |
799 } // namespace extensions | 801 } // namespace extensions |
OLD | NEW |