Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2015)

Unified Diff: chrome/browser/storage_monitor/image_capture_device.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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/storage_monitor/image_capture_device.h
diff --git a/chrome/browser/storage_monitor/image_capture_device.h b/chrome/browser/storage_monitor/image_capture_device.h
index 0860d9d6c8be0b0e6602d868473dae37c11e65a4..82fd1b5e77c6c878cdcc51ee50d7c0fba9f94dcb 100644
--- a/chrome/browser/storage_monitor/image_capture_device.h
+++ b/chrome/browser/storage_monitor/image_capture_device.h
@@ -11,8 +11,8 @@
#include "base/files/file_path.h"
#include "base/mac/cocoa_protocols.h"
#include "base/mac/foundation_util.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_nsobject.h"
#include "base/memory/weak_ptr.h"
#include "base/platform_file.h"
#include "base/strings/string_util.h"
@@ -58,7 +58,7 @@ class ImageCaptureDeviceListener {
@interface ImageCaptureDevice
: NSObject<ICCameraDeviceDelegate, ICCameraDeviceDownloadDelegate> {
@private
- scoped_nsobject<ICCameraDevice> camera_;
+ base::scoped_nsobject<ICCameraDevice> camera_;
base::WeakPtr<ImageCaptureDeviceListener> listener_;
bool closing_;
}

Powered by Google App Engine
This is Rietveld 408576698