| 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 #import "content/browser/web_contents/web_drag_source_mac.h" | 5 #import "content/browser/web_contents/web_drag_source_mac.h" |
| 6 | 6 |
| 7 #include <sys/param.h> | 7 #include <sys/param.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 addTypes:[NSArray arrayWithObject:ui::kWebCustomDataPboardType] | 450 addTypes:[NSArray arrayWithObject:ui::kWebCustomDataPboardType] |
| 451 owner:contentsView_]; | 451 owner:contentsView_]; |
| 452 } | 452 } |
| 453 } | 453 } |
| 454 | 454 |
| 455 - (NSImage*)dragImage { | 455 - (NSImage*)dragImage { |
| 456 if (dragImage_) | 456 if (dragImage_) |
| 457 return dragImage_; | 457 return dragImage_; |
| 458 | 458 |
| 459 // Default to returning a generic image. | 459 // Default to returning a generic image. |
| 460 return content::GetContentClient()->GetNativeImageNamed(IDR_DEFAULT_FAVICON); | 460 return content::GetContentClient()->GetNativeImageNamed( |
| 461 IDR_DEFAULT_FAVICON).ToNSImage(); |
| 461 } | 462 } |
| 462 | 463 |
| 463 @end // @implementation WebDragSource (Private) | 464 @end // @implementation WebDragSource (Private) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10933083:
Remove deprecated gfx::Image::operator NSImage*(). (Closed)
Base URL: http://git.chromium.org/chromium/src.git@master