diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-12 16:24:50 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-12 16:24:50 +0000 |
| commit | 7f6bde6dfd1e59c54e21cb537720e504be5ba078 (patch) | |
| tree | 8a11679f220e6fd760a09eebf2fd1c0dae98776f /base/mac | |
| parent | b0b10d2043886971f578280b614b83d2030183bd (diff) | |
| download | chromium_src-7f6bde6dfd1e59c54e21cb537720e504be5ba078.zip chromium_src-7f6bde6dfd1e59c54e21cb537720e504be5ba078.tar.gz chromium_src-7f6bde6dfd1e59c54e21cb537720e504be5ba078.tar.bz2 | |
Revert 176529 due to compile failures
> [Media Galleries] Add an ImageCaptureCore listener for Mac. (part 2)
>
> This listener uses the ImageCapture API to watch for attach and detach
> events of PTP devices and other devices which can be read through the
> library. It forwards such notifications through the SystemMonitor.
>
> Also provides an API for clients to access such devices directly and
> retrieve the media contents from them.
>
> R=thestig@chromium.org,sail@chromium.org
> BUG=151681
>
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175471
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175938
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176243
>
> Review URL: https://chromiumcodereview.appspot.com/11442057
TBR=gbillock@chromium.org
Review URL: https://codereview.chromium.org/11880013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
| -rw-r--r-- | base/mac/cocoa_protocols.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/base/mac/cocoa_protocols.h b/base/mac/cocoa_protocols.h index e83fcbb..314e7fa7 100644 --- a/base/mac/cocoa_protocols.h +++ b/base/mac/cocoa_protocols.h @@ -26,7 +26,6 @@ MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 DEFINE_EMPTY_PROTOCOL(NSDraggingDestination) -DEFINE_EMPTY_PROTOCOL(ICCameraDeviceDownloadDelegate) #endif // MAC_OS_X_VERSION_10_7 |