Commit 06670b5b authored by Eve Martin-Jones's avatar Eve Martin-Jones Committed by Commit Bot

Replace WTF_MAKE_NONCOPYABLE with DISALLOW_COPY_AND_ASSIGN in core/clipboard/*

This change is for files in the path
//third_party/WebKit/Source/core/clipboard/.

Added the include for base/macros.h where needed and moved the macro to the
end of the class as per the code guidelines enforced by lint.

This CL introduces no logic changes.

Bug: 565932
Change-Id: Ie725fb237db6d86efc373e415c7dfbf4dea42a2f
Reviewed-on: https://chromium-review.googlesource.com/812366Reviewed-by: default avatarSasha Morrissey <sashab@chromium.org>
Commit-Queue: Eve Martin-Jones <evem@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522361}
parent 0fdf6a76
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#ifndef DataTransferItem_h #ifndef DataTransferItem_h
#define DataTransferItem_h #define DataTransferItem_h
#include "base/macros.h"
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "platform/bindings/ScriptWrappable.h" #include "platform/bindings/ScriptWrappable.h"
#include "platform/bindings/TraceWrapperMember.h" #include "platform/bindings/TraceWrapperMember.h"
...@@ -48,7 +49,6 @@ class V8FunctionStringCallback; ...@@ -48,7 +49,6 @@ class V8FunctionStringCallback;
class CORE_EXPORT DataTransferItem final : public ScriptWrappable { class CORE_EXPORT DataTransferItem final : public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
WTF_MAKE_NONCOPYABLE(DataTransferItem);
public: public:
static DataTransferItem* Create(DataTransfer*, DataObjectItem*); static DataTransferItem* Create(DataTransfer*, DataObjectItem*);
...@@ -75,6 +75,7 @@ class CORE_EXPORT DataTransferItem final : public ScriptWrappable { ...@@ -75,6 +75,7 @@ class CORE_EXPORT DataTransferItem final : public ScriptWrappable {
Member<DataTransfer> data_transfer_; Member<DataTransfer> data_transfer_;
Member<DataObjectItem> item_; Member<DataObjectItem> item_;
HeapVector<TraceWrapperMember<V8FunctionStringCallback>> callbacks_; HeapVector<TraceWrapperMember<V8FunctionStringCallback>> callbacks_;
DISALLOW_COPY_AND_ASSIGN(DataTransferItem);
}; };
} // namespace blink } // namespace blink
......
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
#ifndef Pasteboard_h #ifndef Pasteboard_h
#define Pasteboard_h #define Pasteboard_h
#include "base/macros.h"
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "platform/heap/Handle.h" #include "platform/heap/Handle.h"
#include "platform/wtf/Forward.h" #include "platform/wtf/Forward.h"
#include "platform/wtf/Noncopyable.h"
#include "platform/wtf/text/WTFString.h" #include "platform/wtf/text/WTFString.h"
#include "public/platform/WebClipboard.h" #include "public/platform/WebClipboard.h"
...@@ -40,7 +40,6 @@ class Image; ...@@ -40,7 +40,6 @@ class Image;
class KURL; class KURL;
class CORE_EXPORT Pasteboard { class CORE_EXPORT Pasteboard {
WTF_MAKE_NONCOPYABLE(Pasteboard);
USING_FAST_MALLOC(Pasteboard); USING_FAST_MALLOC(Pasteboard);
public: public:
...@@ -76,6 +75,7 @@ class CORE_EXPORT Pasteboard { ...@@ -76,6 +75,7 @@ class CORE_EXPORT Pasteboard {
Pasteboard(); Pasteboard();
mojom::ClipboardBuffer buffer_; mojom::ClipboardBuffer buffer_;
DISALLOW_COPY_AND_ASSIGN(Pasteboard);
}; };
} // namespace blink } // namespace blink
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment