Chromium Code Reviews (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

Unified Diff: chrome/browser/tab_contents/

Issue 1037008: Retry r41799:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/
--- chrome/browser/tab_contents/ (revision 41876)
+++ chrome/browser/tab_contents/ (working copy)
@@ -126,8 +126,11 @@
*out = [cocoa_view_.get() NSRectToRect:[cocoa_view_.get() bounds]];
-void TabContentsViewMac::StartDragging(const WebDropData& drop_data,
- WebDragOperationsMask allowed_operations) {
+void TabContentsViewMac::StartDragging(
+ const WebDropData& drop_data,
+ WebDragOperationsMask allowed_operations,
+ const SkBitmap& image,
+ const gfx::Point& image_offset) {
// By allowing nested tasks, the code below also allows Close(),
// which would deallocate |this|. The same problem can occur while
// processing -sendEvent:, so Close() is deferred in that case.
@@ -138,6 +141,7 @@
// The drag invokes a nested event loop, arrange to continue
// processing events.
MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
+ // TODO(estade): make use of |image| and |image_offset|.
NSDragOperation mask = static_cast<NSDragOperation>(allowed_operations);
[cocoa_view_ startDragWithDropData:drop_data

Powered by Google App Engine
This is Rietveld 408576698