| OLD | NEW | 
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/cocoa/bookmarks/bookmark_drag_drop.h" | 5 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop.h" | 
| 6 | 6 | 
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> | 
| 8 | 8 | 
| 9 #include <cmath> | 9 #include <cmath> | 
| 10 | 10 | 
| 11 #include "base/logging.h" | 11 #include "base/logging.h" | 
| 12 #include "base/memory/scoped_nsobject.h" | 12 #include "base/memory/scoped_nsobject.h" | 
| 13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" | 
| 14 #include "base/string16.h" | 14 #include "base/string16.h" | 
| 15 #include "base/sys_string_conversions.h" | 15 #include "base/sys_string_conversions.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_model.h" | 17 #include "chrome/browser/bookmarks/bookmark_model.h" | 
| 18 #include "chrome/browser/bookmarks/bookmark_node_data.h" | 18 #include "chrome/browser/bookmarks/bookmark_node_data.h" | 
| 19 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" | 19 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" | 
| 20 #include "chrome/browser/bookmarks/bookmark_utils.h" | 20 #include "chrome/browser/bookmarks/bookmark_utils.h" | 
| 21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" | 
| 22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 
| 23 #include "grit/ui_resources.h" | 23 #include "grit/ui_resources.h" | 
| 24 #include "ui/base/resource/resource_bundle.h" | 24 #include "ui/base/resource/resource_bundle.h" | 
| 25 #include "ui/gfx/mac/nsimage_cache.h" |  | 
| 26 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 25 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" | 
| 27 | 26 | 
| 28 namespace chrome { | 27 namespace chrome { | 
| 29 | 28 | 
| 30 namespace { | 29 namespace { | 
| 31 | 30 | 
| 32 // Make a drag image from the drop data. | 31 // Make a drag image from the drop data. | 
| 33 NSImage* MakeDragImage(BookmarkModel* model, | 32 NSImage* MakeDragImage(BookmarkModel* model, | 
| 34                        const std::vector<const BookmarkNode*>& nodes) { | 33                        const std::vector<const BookmarkNode*>& nodes) { | 
| 35   if (nodes.size() == 1) { | 34   if (nodes.size() == 1) { | 
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 181              offset:NSZeroSize | 180              offset:NSZeroSize | 
| 182               event:drag_event | 181               event:drag_event | 
| 183          pasteboard:[NSPasteboard pasteboardWithName:NSDragPboard] | 182          pasteboard:[NSPasteboard pasteboardWithName:NSDragPboard] | 
| 184              source:nil | 183              source:nil | 
| 185           slideBack:YES]; | 184           slideBack:YES]; | 
| 186 | 185 | 
| 187   MessageLoop::current()->SetNestableTasksAllowed(was_nested); | 186   MessageLoop::current()->SetNestableTasksAllowed(was_nested); | 
| 188 } | 187 } | 
| 189 | 188 | 
| 190 }  // namespace bookmark_utils | 189 }  // namespace bookmark_utils | 
| OLD | NEW | 
|---|