ui/base/dragdrop/os_exchange_data_provider_win.h - Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.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: ui/base/dragdrop/os_exchange_data_provider_win.h

Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert bad indentation, rebase Created 9 years, 8 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: ui/base/dragdrop/os_exchange_data_provider_win.h

diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h

index d321161ad6d82988eed16d41990d444e96a2e356..e1cf86986bd26a96066b8609683b142bd01f273b 100644

--- a/ui/base/dragdrop/os_exchange_data_provider_win.h

+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h

@@ -10,7 +10,7 @@

#include <shlobj.h>

#include <string>

-#include "base/scoped_comptr_win.h"

+#include "base/win/scoped_comptr.h"

#include "ui/base/dragdrop/os_exchange_data.h"

namespace ui {

@@ -112,7 +112,7 @@ class DataObjectImpl : public DownloadFileObserver,

typedef std::vector<StoredDataInfo*> StoredData;

StoredData contents_;

- ScopedComPtr<IDataObject> source_object_;

+ base::win::ScopedComPtr<IDataObject> source_object_;

bool is_aborting_;

bool in_async_mode_;

@@ -170,7 +170,7 @@ class OSExchangeDataProviderWin : public OSExchangeData::Provider {

private:

scoped_refptr<DataObjectImpl> data_;

- ScopedComPtr<IDataObject> source_object_;

+ base::win::ScopedComPtr<IDataObject> source_object_;

DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderWin);

};