diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 03:30:52 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 03:30:52 +0000 |
| commit | 302e0f230aa857d9e957ce29c14792776758afde (patch) | |
| tree | 6ff7cef7daa32a0fbe3792fea45805a98de4f62c /chrome/browser/chrome_browser_main_mac.mm | |
| parent | 874c1923b23798aae068cdb6f7f01e74c2b695d8 (diff) | |
| download | chromium_src-302e0f230aa857d9e957ce29c14792776758afde.zip chromium_src-302e0f230aa857d9e957ce29c14792776758afde.tar.gz chromium_src-302e0f230aa857d9e957ce29c14792776758afde.tar.bz2 | |
Revert 176243
Broke Mac Builder (dbg) compile:
../../chrome/browser/system_monitor/image_capture_device_manager_unittest.mm:121:3:error: instance method '-didDownloadFileerror:options:contextInfo:' not found (return type defaults to 'id') [-Werror,-Wobjc-method-access]
[downloadDelegate didDownloadFile:file
^ ~~~~~~~~~~~~~~~~~~~~
../../chrome/browser/system_monitor/image_capture_device_manager_unittest.mm:287:3:error: instance method '-deviceDidBecomeReadyWithCompleteContentCatalog:' not found (return type defaults to 'id') [-Werror,-Wobjc-method-access]
[camera deviceDidBecomeReadyWithCompleteContentCatalog:nil];
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> [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
>
> Review URL: https://chromiumcodereview.appspot.com/11442057
TBR=gbillock@chromium.org
Review URL: https://codereview.chromium.org/11862004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_mac.mm')
| -rw-r--r-- | chrome/browser/chrome_browser_main_mac.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm index 030ff23..fc4bb44 100644 --- a/chrome/browser/chrome_browser_main_mac.mm +++ b/chrome/browser/chrome_browser_main_mac.mm @@ -22,7 +22,6 @@ #include "chrome/browser/mac/keychain_reauthorize.h" #import "chrome/browser/mac/keystone_glue.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/system_monitor/image_capture_device_manager.h" #include "chrome/browser/system_monitor/removable_device_notifications_mac.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -284,9 +283,6 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() { void ChromeBrowserMainPartsMac::PreProfileInit() { removable_device_notifications_mac_ = new chrome::RemovableDeviceNotificationsMac(); - if (base::mac::IsOSLionOrLater()) - image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager); - ChromeBrowserMainPartsPosix::PreProfileInit(); } |