summaryrefslogtreecommitdiffstats
path: root/ui/base/dragdrop
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-04-20 22:14:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-21 05:14:42 +0000
commit98a2105e09e19d92300270853a7bdbccaca4a121 (patch)
tree953630f7d381417f93418907a7e6efeac10df5d3 /ui/base/dragdrop
parent67362f0169457bde9a03440dfc304426e7c2350b (diff)
downloadchromium_src-98a2105e09e19d92300270853a7bdbccaca4a121.zip
chromium_src-98a2105e09e19d92300270853a7bdbccaca4a121.tar.gz
chromium_src-98a2105e09e19d92300270853a7bdbccaca4a121.tar.bz2
Apply automated fixits for Chrome clang plugin to ui_base_unittests.
Working on trimming down plugin warnings on the Windows clang build. BUG=467287 Review URL: https://codereview.chromium.org/1096213002 Cr-Commit-Position: refs/heads/master@{#325983}
Diffstat (limited to 'ui/base/dragdrop')
-rw-r--r--ui/base/dragdrop/drag_source_win.h7
-rw-r--r--ui/base/dragdrop/drop_target_win.h14
-rw-r--r--ui/base/dragdrop/os_exchange_data_provider_win.cc17
-rw-r--r--ui/base/dragdrop/os_exchange_data_provider_win.h57
4 files changed, 51 insertions, 44 deletions
diff --git a/ui/base/dragdrop/drag_source_win.h b/ui/base/dragdrop/drag_source_win.h
index cba7ad5..9d442a8 100644
--- a/ui/base/dragdrop/drag_source_win.h
+++ b/ui/base/dragdrop/drag_source_win.h
@@ -26,7 +26,7 @@ class UI_BASE_EXPORT DragSourceWin
IDropSource> {
public:
DragSourceWin();
- virtual ~DragSourceWin() {}
+ ~DragSourceWin() override {}
// Stop the drag operation at the next chance we get. This doesn't
// synchronously stop the drag (since Windows is controlling that),
@@ -36,8 +36,9 @@ class UI_BASE_EXPORT DragSourceWin
}
// IDropSource implementation:
- HRESULT __stdcall QueryContinueDrag(BOOL escape_pressed, DWORD key_state);
- HRESULT __stdcall GiveFeedback(DWORD effect);
+ HRESULT __stdcall QueryContinueDrag(BOOL escape_pressed,
+ DWORD key_state) override;
+ HRESULT __stdcall GiveFeedback(DWORD effect) override;
// Used to set the active data object for the current drag operation. The
// caller must ensure that |data| is not destroyed before the nested drag loop
diff --git a/ui/base/dragdrop/drop_target_win.h b/ui/base/dragdrop/drop_target_win.h
index 4536f1d..2cc5493c 100644
--- a/ui/base/dragdrop/drop_target_win.h
+++ b/ui/base/dragdrop/drop_target_win.h
@@ -34,20 +34,20 @@ class UI_BASE_EXPORT DropTargetWin : public IDropTarget {
HRESULT __stdcall DragEnter(IDataObject* data_object,
DWORD key_state,
POINTL cursor_position,
- DWORD* effect);
+ DWORD* effect) override;
HRESULT __stdcall DragOver(DWORD key_state,
POINTL cursor_position,
- DWORD* effect);
- HRESULT __stdcall DragLeave();
+ DWORD* effect) override;
+ HRESULT __stdcall DragLeave() override;
HRESULT __stdcall Drop(IDataObject* data_object,
DWORD key_state,
POINTL cursor_position,
- DWORD* effect);
+ DWORD* effect) override;
// IUnknown implementation:
- HRESULT __stdcall QueryInterface(const IID& iid, void** object);
- ULONG __stdcall AddRef();
- ULONG __stdcall Release();
+ HRESULT __stdcall QueryInterface(const IID& iid, void** object) override;
+ ULONG __stdcall AddRef() override;
+ ULONG __stdcall Release() override;
protected:
// Returns the hosting HWND.
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 63c8a69..64330ee 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -70,16 +70,17 @@ class FormatEtcEnumerator final : public IEnumFORMATETC {
~FormatEtcEnumerator();
// IEnumFORMATETC implementation:
- HRESULT __stdcall Next(
- ULONG count, FORMATETC* elements_array, ULONG* elements_fetched);
- HRESULT __stdcall Skip(ULONG skip_count);
- HRESULT __stdcall Reset();
- HRESULT __stdcall Clone(IEnumFORMATETC** clone);
+ HRESULT __stdcall Next(ULONG count,
+ FORMATETC* elements_array,
+ ULONG* elements_fetched) override;
+ HRESULT __stdcall Skip(ULONG skip_count) override;
+ HRESULT __stdcall Reset() override;
+ HRESULT __stdcall Clone(IEnumFORMATETC** clone) override;
// IUnknown implementation:
- HRESULT __stdcall QueryInterface(const IID& iid, void** object);
- ULONG __stdcall AddRef();
- ULONG __stdcall Release();
+ HRESULT __stdcall QueryInterface(const IID& iid, void** object) override;
+ ULONG __stdcall AddRef() override;
+ ULONG __stdcall Release() override;
private:
// This can only be called from |CloneFromOther|, since it initializes the
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index 4065bcb..70ec9fb 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -49,43 +49,48 @@ class DataObjectImpl : public DownloadFileObserver,
size_t size() const { return contents_.size(); }
// DownloadFileObserver implementation:
- virtual void OnDownloadCompleted(const base::FilePath& file_path);
- virtual void OnDownloadAborted();
+ void OnDownloadCompleted(const base::FilePath& file_path) override;
+ void OnDownloadAborted() override;
// IDataObject implementation:
- HRESULT __stdcall GetData(FORMATETC* format_etc, STGMEDIUM* medium);
- HRESULT __stdcall GetDataHere(FORMATETC* format_etc, STGMEDIUM* medium);
- HRESULT __stdcall QueryGetData(FORMATETC* format_etc);
- HRESULT __stdcall GetCanonicalFormatEtc(
- FORMATETC* format_etc, FORMATETC* result);
- HRESULT __stdcall SetData(
- FORMATETC* format_etc, STGMEDIUM* medium, BOOL should_release);
- HRESULT __stdcall EnumFormatEtc(
- DWORD direction, IEnumFORMATETC** enumerator);
- HRESULT __stdcall DAdvise(FORMATETC* format_etc, DWORD advf,
- IAdviseSink* sink, DWORD* connection);
- HRESULT __stdcall DUnadvise(DWORD connection);
- HRESULT __stdcall EnumDAdvise(IEnumSTATDATA** enumerator);
+ HRESULT __stdcall GetData(FORMATETC* format_etc, STGMEDIUM* medium) override;
+ HRESULT __stdcall GetDataHere(FORMATETC* format_etc,
+ STGMEDIUM* medium) override;
+ HRESULT __stdcall QueryGetData(FORMATETC* format_etc) override;
+ HRESULT __stdcall GetCanonicalFormatEtc(FORMATETC* format_etc,
+ FORMATETC* result) override;
+ HRESULT __stdcall SetData(FORMATETC* format_etc,
+ STGMEDIUM* medium,
+ BOOL should_release) override;
+ HRESULT __stdcall EnumFormatEtc(DWORD direction,
+ IEnumFORMATETC** enumerator) override;
+ HRESULT __stdcall DAdvise(FORMATETC* format_etc,
+ DWORD advf,
+ IAdviseSink* sink,
+ DWORD* connection) override;
+ HRESULT __stdcall DUnadvise(DWORD connection) override;
+ HRESULT __stdcall EnumDAdvise(IEnumSTATDATA** enumerator) override;
// IDataObjectAsyncCapability implementation:
- HRESULT __stdcall EndOperation(
- HRESULT result, IBindCtx* reserved, DWORD effects);
- HRESULT __stdcall GetAsyncMode(BOOL* is_op_async);
- HRESULT __stdcall InOperation(BOOL* in_async_op);
- HRESULT __stdcall SetAsyncMode(BOOL do_op_async);
- HRESULT __stdcall StartOperation(IBindCtx* reserved);
+ HRESULT __stdcall EndOperation(HRESULT result,
+ IBindCtx* reserved,
+ DWORD effects) override;
+ HRESULT __stdcall GetAsyncMode(BOOL* is_op_async) override;
+ HRESULT __stdcall InOperation(BOOL* in_async_op) override;
+ HRESULT __stdcall SetAsyncMode(BOOL do_op_async) override;
+ HRESULT __stdcall StartOperation(IBindCtx* reserved) override;
// IUnknown implementation:
- HRESULT __stdcall QueryInterface(const IID& iid, void** object);
- ULONG __stdcall AddRef();
- ULONG __stdcall Release();
+ HRESULT __stdcall QueryInterface(const IID& iid, void** object) override;
+ ULONG __stdcall AddRef() override;
+ ULONG __stdcall Release() override;
private:
// FormatEtcEnumerator only likes us for our StoredDataMap typedef.
friend class FormatEtcEnumerator;
friend class OSExchangeDataProviderWin;
- virtual ~DataObjectImpl();
+ ~DataObjectImpl() override;
void StopDownloads();
@@ -142,7 +147,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin
explicit OSExchangeDataProviderWin(IDataObject* source);
OSExchangeDataProviderWin();
- virtual ~OSExchangeDataProviderWin();
+ ~OSExchangeDataProviderWin() override;
IDataObject* data_object() const { return data_.get(); }
IDataObjectAsyncCapability* async_operation() const { return data_.get(); }