diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
commit | 00ffe5dd99527a0cb1035af6749417f5fb1c134e (patch) | |
tree | 4354d5b35be202204d9392417862b423ba374ce0 /app/os_exchange_data.h | |
parent | 65f73a3a996bdbaa167e38704df092aa39b53d3a (diff) | |
download | chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.zip chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.gz chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.bz2 |
Revert 15965. I wasn't supposed to check that in since it still doesn't compile on linux and mac!
TBR=sky
Review URL: http://codereview.chromium.org/113351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/os_exchange_data.h')
-rw-r--r-- | app/os_exchange_data.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/os_exchange_data.h b/app/os_exchange_data.h index 4a8fbc4..5668008 100644 --- a/app/os_exchange_data.h +++ b/app/os_exchange_data.h @@ -5,10 +5,11 @@ #ifndef APP_OS_EXCHANGE_DATA_H_ #define APP_OS_EXCHANGE_DATA_H_ +#include <atlbase.h> #include <objidl.h> #include <vector> -#include "base/scoped_comptr_win.h" +#include "base/basictypes.h" class GURL; class Pickle; @@ -133,7 +134,7 @@ class OSExchangeData : public IDataObject { typedef std::vector<StoredDataInfo*> StoredData; StoredData contents_; - ScopedComPtr<IDataObject> source_object_; + CComPtr<IDataObject> source_object_; LONG ref_count_; |