summaryrefslogtreecommitdiffstats
path: root/ui/base/dragdrop
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-04-28 09:11:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-28 16:12:16 +0000
commit62141ba51cb3109fa2eb8c304bd52b099fc73f4f (patch)
tree0fb0468ab3a3dbdc97015a35e798f4c2e4703fd7 /ui/base/dragdrop
parent056966e85df9d132d6ff8bcc5f68ad0eef7750e2 (diff)
downloadchromium_src-62141ba51cb3109fa2eb8c304bd52b099fc73f4f.zip
chromium_src-62141ba51cb3109fa2eb8c304bd52b099fc73f4f.tar.gz
chromium_src-62141ba51cb3109fa2eb8c304bd52b099fc73f4f.tar.bz2
ui/base/dragdrop: Fix warnings found by clang chromium-style plugin on Windows.
http://build.chromium.org/p/chromium.fyi/builders/CrWinClang/builds/622/steps/compile/logs/stdio This fixes the following kind or warnings: warning(clang): [chromium-style] Complex constructor has an inlined body. warning(clang): [chromium-style] Complex destructor has an inline body. BUG=467287 R=thakis@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/1103323004 Cr-Commit-Position: refs/heads/master@{#327296}
Diffstat (limited to 'ui/base/dragdrop')
-rw-r--r--ui/base/dragdrop/os_exchange_data_provider_win.cc14
-rw-r--r--ui/base/dragdrop/os_exchange_data_provider_win.h13
2 files changed, 16 insertions, 11 deletions
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 64330ee..ac57ffc 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -626,6 +626,20 @@ static void DuplicateMedium(CLIPFORMAT source_clipformat,
destination->pUnkForRelease->AddRef();
}
+DataObjectImpl::StoredDataInfo::StoredDataInfo(const FORMATETC& format_etc,
+ STGMEDIUM* medium)
+ : format_etc(format_etc), medium(medium), owns_medium(true) {
+}
+
+DataObjectImpl::StoredDataInfo::~StoredDataInfo() {
+ if (owns_medium) {
+ ReleaseStgMedium(medium);
+ delete medium;
+ }
+ if (downloader.get())
+ downloader->Stop();
+}
+
DataObjectImpl::DataObjectImpl()
: is_aborting_(false),
in_drag_loop_(false),
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index 70ec9fb..59479ac 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -104,17 +104,8 @@ class DataObjectImpl : public DownloadFileObserver,
bool owns_medium;
scoped_refptr<DownloadFileProvider> downloader;
- StoredDataInfo(const FORMATETC& format_etc, STGMEDIUM* medium)
- : format_etc(format_etc), medium(medium), owns_medium(true) {}
-
- ~StoredDataInfo() {
- if (owns_medium) {
- ReleaseStgMedium(medium);
- delete medium;
- }
- if (downloader.get())
- downloader->Stop();
- }
+ StoredDataInfo(const FORMATETC& format_etc, STGMEDIUM* medium);
+ ~StoredDataInfo();
};
typedef ScopedVector<StoredDataInfo> StoredData;