chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm

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:

Index: chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm

diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm

index 7c4447f216e46bb106d6a1923921c549be16061d..87119f1443d656e963527ad7f851e291029e3f2c 100644

--- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm

+++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm

@@ -6,7 +6,7 @@

#include <algorithm>

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

#include "base/threading/sequenced_worker_pool.h"

#include "chrome/browser/media_galleries/mtp_device_delegate_impl.h"

#include "chrome/browser/storage_monitor/image_capture_device.h"

@@ -61,7 +61,7 @@ class MTPDeviceDelegateImplMac::DeviceListener

virtual void ResetDelegate();

private:

- scoped_nsobject<ImageCaptureDevice> camera_device_;

+ base::scoped_nsobject<ImageCaptureDevice> camera_device_;

// Weak pointer

MTPDeviceDelegateImplMac* delegate_;